diff --git a/build/with_fcm/arch/arch-ECMWF_NEC440MPI225DP.AU.x.env b/build/with_fcm/arch/arch-ECMWF_NEC440MPI225DP.AU.x.env index a5c1f093df839d23dce63a10fa185332da20234d..c1473b389e2a948495657c433fd053488a07003f 100644 --- a/build/with_fcm/arch/arch-ECMWF_NEC440MPI225DP.AU.x.env +++ b/build/with_fcm/arch/arch-ECMWF_NEC440MPI225DP.AU.x.env @@ -25,6 +25,7 @@ export VE_LD_PRELOAD=libveaccio.so.1 #use accelerated I/O export VE_TRACEBACK=VERBOSE #Profile report export MPIPROGINF=DETAIL +export VE_PROGINF=DETAIL ######################################################## #We must not use -ldl during link edition diff --git a/build/with_fcm/arch/arch-ECMWF_NEC440MPI225DP.AU.x.fcm b/build/with_fcm/arch/arch-ECMWF_NEC440MPI225DP.AU.x.fcm index 70973947a4260a3f6fc8c07d6b6d08bb0b84ae17..182ae9a55002e66a71d5f68944cd9832b2af41f0 100644 --- a/build/with_fcm/arch/arch-ECMWF_NEC440MPI225DP.AU.x.fcm +++ b/build/with_fcm/arch/arch-ECMWF_NEC440MPI225DP.AU.x.fcm @@ -1,7 +1,7 @@ # Compilation $FCOMPILER = mpinfort $BASE_FFLAGS = -c -fopenmp -traceback=verbose -fdiag-vector=3 -fdiag-inline=2 -fpic -mstack-arrays -fdefault-real=8 -$PROD_FFLAGS = -g -O3 -mno-vector-fma -finline-functions -finline-max-depth=3 -mvector-floating-divide-instruction -mvector-sqrt-instruction -fcse-after-vectorization -mvector-advance-gather +$PROD_FFLAGS = -g -O3 -mno-vector-fma -mvector-floating-divide-instruction -mvector-sqrt-instruction -fcse-after-vectorization -mvector-advance-gather $DEV_FFLAGS = -g -O0 $DEBUG_FFLAGS = -g -O0 -fbounds-check -minit-stack=snan $CCOMPILER = mpincc diff --git a/build/with_fcm/arch/arch-ECMWF_NEC440MPI225SP.AU.x.env b/build/with_fcm/arch/arch-ECMWF_NEC440MPI225SP.AU.x.env deleted file mode 100644 index a5c1f093df839d23dce63a10fa185332da20234d..0000000000000000000000000000000000000000 --- a/build/with_fcm/arch/arch-ECMWF_NEC440MPI225SP.AU.x.env +++ /dev/null @@ -1,31 +0,0 @@ -####################################################### -#Selection from /home/rme/public/bin/env_nec-4.4.0_mpi-2.25.0 - -# MPI : -shift $# #This line suppresses the arguments received by the calling script - #when the current file is sourced. It is needed because - #necmpivars.sh tests the presence of arguments -source /opt/nec/ve/mpi/2.25.0/bin64/necmpivars.sh - -# Increased stack size needed for the compiler : -ulimit -s unlimited - -####################################################### -#Selection from /home/rme/public/scripts/O-vector-engine -# Open-MP business : -export OMP_STACKSIZE=4G -# VE settings -export VE_FORT_UFMTENDIAN=ALL -#export VE_BLAS_DGEMM_MODE=GREEDYA #needed for reporducibility -export VE_FORT_RECORDBUF=3072000 # make input buffer longer -#export VE_INIT_HEAP=ZERO -export VE_FPE_ENABLE=(DIV,FOF,FUF,INV,INE) -export VE_LD_PRELOAD=libveaccio.so.1 #use accelerated I/O -#verbose execution summary -export VE_TRACEBACK=VERBOSE -#Profile report -export MPIPROGINF=DETAIL - -######################################################## -#We must not use -ldl during link edition -LIBS='rt' diff --git a/build/with_fcm/arch/arch-ECMWF_NEC440MPI225SP.AU.x.env b/build/with_fcm/arch/arch-ECMWF_NEC440MPI225SP.AU.x.env new file mode 120000 index 0000000000000000000000000000000000000000..cafa68d30c4748cc18d03b6a5291f1b74d047729 --- /dev/null +++ b/build/with_fcm/arch/arch-ECMWF_NEC440MPI225SP.AU.x.env @@ -0,0 +1 @@ +arch-ECMWF_NEC440MPI225DP.AU.x.env \ No newline at end of file diff --git a/build/with_fcm/arch/arch-ECMWF_NEC440MPI225SP.AU.x.fcm b/build/with_fcm/arch/arch-ECMWF_NEC440MPI225SP.AU.x.fcm index 1303abd94605e2c0c0456a18b8cfc15f41ae4c33..774760a83496759c1b9fe10a95a8873dfcb5d216 100644 --- a/build/with_fcm/arch/arch-ECMWF_NEC440MPI225SP.AU.x.fcm +++ b/build/with_fcm/arch/arch-ECMWF_NEC440MPI225SP.AU.x.fcm @@ -1,7 +1,7 @@ # Compilation $FCOMPILER = mpinfort $BASE_FFLAGS = -c -fopenmp -traceback=verbose -fdiag-vector=3 -fdiag-inline=2 -fpic -mstack-arrays -$PROD_FFLAGS = -g -O3 -mno-vector-fma -finline-functions -finline-max-depth=3 -mvector-floating-divide-instruction -mvector-sqrt-instruction -fcse-after-vectorization -mvector-advance-gather +$PROD_FFLAGS = -g -O3 -mno-vector-fma -mvector-floating-divide-instruction -mvector-sqrt-instruction -fcse-after-vectorization -mvector-advance-gather $DEV_FFLAGS = -g -O0 $DEBUG_FFLAGS = -g -O0 -fbounds-check -minit-stack=snanf $CCOMPILER = mpincc diff --git a/src/common/micro/mode_ice4_sedimentation_stat.F90 b/src/common/micro/mode_ice4_sedimentation_stat.F90 index 8bd7e8f823083c5c8787ff2b5f24ab6aaac0c7cb..cd1d7d109e6f660f3646e55146f1184deec1605f 100644 --- a/src/common/micro/mode_ice4_sedimentation_stat.F90 +++ b/src/common/micro/mode_ice4_sedimentation_stat.F90 @@ -94,7 +94,7 @@ REAL :: ZQP, ZINVTSTEP, ZGAC, ZGC, ZGAC2, ZGC2, ZRAYDEFO, ZLBDAS REAL, DIMENSION(D%NIJT) :: ZWSEDW1, ZWSEDW2 ! sedimentation speed REAL, DIMENSION(D%NIJT) :: ZTSORHODZ ! TimeStep Over (Rhodref times delta Z) REAL, DIMENSION(D%NIJT,0:1,2:KRR) :: ZSED ! sedimentation flux array for each species and for above and current levels -REAL :: FWSED1, FWSED2, PWSEDW, PWSEDWSUP, PINVTSTEP, PTSTEP1, PDZZ1, PRHODREF1, PRXT1 +REAL :: PWSEDW, PWSEDWSUP, PINVTSTEP, PTSTEP1, PDZZ1, PRHODREF1, PRXT1 ! REAL :: ZLBC ! XLBC weighted by sea fraction REAL :: ZFSEDC @@ -457,7 +457,6 @@ CONTAINS END SUBROUTINE SHIFT ! -END SUBROUTINE ICE4_SEDIMENTATION_STAT ! ELEMENTAL FUNCTION FWSED1(PWSEDW,PTSTEP1,PDZZ1,PRHODREF1,PRXT1,PINVTSTEP) RESULT(PVAR) REAL, INTENT(IN) :: PWSEDW,PTSTEP1,PDZZ1,PRHODREF1,PRXT1,PINVTSTEP @@ -471,4 +470,7 @@ ELEMENTAL FUNCTION FWSED2(PWSEDW,PTSTEP1,PDZZ1,PWSEDWSUP) RESULT(PVAR) REAL :: PVAR PVAR = MAX(0.,1.-PDZZ1/(PTSTEP1*PWSEDW))*PWSEDWSUP END FUNCTION FWSED2 + +END SUBROUTINE ICE4_SEDIMENTATION_STAT + END MODULE MODE_ICE4_SEDIMENTATION_STAT