Merge branch 'SR_misc'

build/with_fcm/arch/arch-gnu9.2.0_belenos.env

@@ -0,0 +1,2 @@
+module load gcc/9.2.0
+module load perl/5.30.3

build/with_fcm/arch/arch-gnu9.2.0_belenos.fcm

@@ -0,0 +1,26 @@
+# Compilation
+$FCOMPILER     =     gfortran
+$BASE_FFLAGS   =     -c -fPIC -fdefault-real-8 -fdefault-double-8 -ffree-line-length-none -fopenmp -fconvert=swap
+$PROD_FFLAGS   =     -O3
+$DEV_FFLAGS    =     -O1
+$DEBUG_FFLAGS  =     -O0 -g -fbounds-check -finit-real=snan -ffpe-trap=invalid,zero,overflow
+$CCOMPILER     =     gcc
+$BASE_CFLAGS   =     -c -fPIC -fopenmp
+$PROD_CFLAGS   =     -O3
+$DEV_CFLAGS    =     -O1
+$DEBUG_CFLAGS  =     -fbounds-check
+$OMP_FFLAGS    =
+
+# Preprocessor
+$FPP_FLAGS     =     LINUX LITTLE_ENDIAN LITTLE REPRO48
+$CPP_FLAGS     =     LINUX LITTLE_ENDIAN LITTLE
+
+# Linker
+$LINK          =     gfortran
+$BASE_LD       =     -fPIC  -fdefault-real-8 -fdefault-double-8 -fopenmp
+$OMP_LD        =
+$LD_EXE_TO_SHARED = -shared
+
+# Other
+$AR            =     ar
+

build/with_fcm/arch/arch-gnu9.2.0_nosignzero_belenos.env

@@ -0,0 +1,2 @@
+module load gcc/9.2.0
+module load perl/5.30.3

build/with_fcm/arch/arch-gnu9.2.0_nosignzero_belenos.fcm

@@ -0,0 +1,26 @@
+# Compilation
+$FCOMPILER     =     gfortran
+$BASE_FFLAGS   =     -c -fPIC -fdefault-real-8 -fdefault-double-8 -ffree-line-length-none -fopenmp -fconvert=swap -fno-sign-zero
+$PROD_FFLAGS   =     -O3
+$DEV_FFLAGS    =     -O1
+$DEBUG_FFLAGS  =     -O0 -g -fbounds-check -finit-real=snan -ffpe-trap=invalid,zero,overflow
+$CCOMPILER     =     gcc
+$BASE_CFLAGS   =     -c -fPIC -fopenmp
+$PROD_CFLAGS   =     -O3
+$DEV_CFLAGS    =     -O1
+$DEBUG_CFLAGS  =     -fbounds-check
+$OMP_FFLAGS    =
+
+# Preprocessor
+$FPP_FLAGS     =     LINUX LITTLE_ENDIAN LITTLE REPRO48
+$CPP_FLAGS     =     LINUX LITTLE_ENDIAN LITTLE
+
+# Linker
+$LINK          =     gfortran
+$BASE_LD       =     -fPIC  -fdefault-real-8 -fdefault-double-8 -fopenmp
+$OMP_LD        =
+$LD_EXE_TO_SHARED = -shared
+
+# Other
+$AR            =     ar
+

build/with_fcm/arch/arch-gnu_nosignzero.fcm

@@ -0,0 +1,26 @@
+# Compilation
+$FCOMPILER     =     gfortran
+$BASE_FFLAGS   =     -c -fPIC -fdefault-real-8 -fdefault-double-8 -ffree-line-length-none -fopenmp -fconvert=swap -fallow-argument-mismatch -fno-sign-zero
+$PROD_FFLAGS   =     -O3
+$DEV_FFLAGS    =     -O1
+$DEBUG_FFLAGS  =     -O0 -g -fbounds-check -finit-real=snan -ffpe-trap=invalid,zero,overflow
+$CCOMPILER     =     gcc
+$BASE_CFLAGS   =     -c -fPIC -fopenmp
+$PROD_CFLAGS   =     -O3
+$DEV_CFLAGS    =     -O1
+$DEBUG_CFLAGS  =     -fbounds-check
+$OMP_FFLAGS    =
+
+# Preprocessor
+$FPP_FLAGS     =     LINUX LITTLE_ENDIAN LITTLE REPRO48
+$CPP_FLAGS     =     LINUX LITTLE_ENDIAN LITTLE
+
+# Linker
+$LINK          =     gfortran
+$BASE_LD       =     -fPIC  -fdefault-real-8 -fdefault-double-8 -fopenmp
+$OMP_LD        =
+$LD_EXE_TO_SHARED = -shared
+
+# Other
+$AR            =     ar
+

src/common/micro/rain_ice.F90

@@ -469,7 +469,7 @@ SUBROUTINE RAIN_ICE ( D, CST, PARAMI, ICEP, ICED, BUCONF,                   &
 !***     6.1    total tendencies limited by available species
 !
 DO JK = IKTB, IKTE
-  DO CONCURRENT (JIJ=IIJB:IIJE)
+  DO JIJ=IIJB, IIJE
     !LV/LS
     ZZ_LSFACT(JIJ,JK)=ZZ_LSFACT(JIJ,JK)/PEXNREF(JIJ,JK)
     ZZ_LVFACT(JIJ,JK)=ZZ_LVFACT(JIJ,JK)/PEXNREF(JIJ,JK)

tools/check_commit_testprogs.sh

@@ -272,8 +272,8 @@ if [ $check -eq 1 ]; then
     fi
     if [ $te -eq 0 ]; then
       set +e
-      mess=$(cmp <(cat $file1 | sed 's/\.\.//g' | sed 's/~=//g' | sed 's/!=//g' | grep -v 'Total time: ') \
-                 <(cat $file2 | sed 's/\.\.//g' | sed 's/~=//g' | sed 's/!=//g' | grep -v 'Total time: ') 246 246 2>&1)
+      mess=$(cmp <(cat $file1 | sed 's/\.\.//g' | sed 's/~=//g' | sed 's/!=//g' | grep -v 'Total time: ' | sed 's/-0.00000E+00|/ 0.00000E+00|/g' | sed 's/-0.00000E+00 / 0.00000E+00 /g' | sed 's/-0.00000E+00-/ 0.00000E+00-/g') \
+                 <(cat $file2 | sed 's/\.\.//g' | sed 's/~=//g' | sed 's/!=//g' | grep -v 'Total time: ' | sed 's/-0.00000E+00|/ 0.00000E+00|/g' | sed 's/-0.00000E+00 / 0.00000E+00 /g' | sed 's/-0.00000E+00-/ 0.00000E+00-/g') 246 246 2>&1)
       te=$?
       set -e
       #The use of "<()" bash syntax replaces the actual file name seen by cmp