S. Riette 8 Jan 2024: fix LMDZ compilation

UMR-CNRM · Jan 8, 2024 · 2f997bc · 2f997bc
1 parent d006e51
commit 2f997bc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/lmdz/ext/physiqex_mod.F90 b/src/lmdz/ext/physiqex_mod.F90
@@ -517,8 +517,8 @@ SUBROUTINE physiqex (nlon,nlev, &
 ZTHVREFZIKB=0
 CALL RAIN_ICE (D, PHYEX%CST, PHYEX%PARAM_ICEN, PHYEX%RAIN_ICE_PARAMN, PHYEX%RAIN_ICE_DESCRN,                      &
                PHYEX%ELEC_PARAM, PHYEX%ELEC_DESCR, PHYEX%MISC%TBUCONF,                                            &
-               OELEC=PHYEX%MISC%OELEC, OSEDIM_BEARD=PHYEX%MISC%OSEDIM_BEARD,                                      &
-               PTHVREFZIKB=ZTHVREFZIKB, HCLOUD='ICE3',                                                            &
+               PHYEX%MISC%OELEC, PHYEX%MISC%OSEDIM_BEARD,                                                         &
+               ZTHVREFZIKB, 'ICE3',                                                                               &
                pdtphys, KRR, ZEXN,                                                                                &
                zdzf, PRHODJ, ZRHOD, ZEXN, ZPABST, ZCIT, ZCLDFR,                                                   &
                ZHLC_HRC, ZHLC_HCF, ZHLI_HRI, ZHLI_HCF,                                                            &

diff --git a/tools/check_commit_lmdz.sh b/tools/check_commit_lmdz.sh
@@ -253,6 +253,7 @@ if [ $packcreation -eq 1 ]; then
     for name in `grep -i 'END MODULE' modd*n.F90 | cut -d: -f1 | sed -e 's/n.F90//'` ; do mv ${name}n.F90 ${name}_n.F90 ; done
     mv hypgeo.F90 modi_hypgeo.F90
     mv hypser.f90 modi_hypser.F90
+    mv momg.F90 modi_momg.F90
     mv tools.F90 mode_tools.F90
     mv shuman_mf.F90 modi_shuman_mf.F90
     mv shuman_phy.F90 mode_shuman_phy.F90

diff --git a/tools/check_commit_testprogs.sh b/tools/check_commit_testprogs.sh
@@ -503,9 +503,9 @@ if [ $run -ge 1 -a "$perffile" != "" ]; then
 
         #Cleaning to suppress old results that may be confusing in case of a crash during the run
         if [ $onlyIfNeeded -eq 0 ]; then
-          for t in $(echo $tests | sed 's/,/ /g'); do
-            if [ -d tests/with_fcm/arch_${archfile}/${t}${perf_extrapolation_tag} ]; then
-              rm -rf tests/with_fcm/arch_${archfile}/${t}${perf_extrapolation_tag}
+          for t2 in $(echo $tests | sed 's/,/ /g'); do
+            if [ -d tests/with_fcm/arch_${archfile}/${t2}${perf_extrapolation_tag} ]; then
+              rm -rf tests/with_fcm/arch_${archfile}/${t2}${perf_extrapolation_tag}
             fi
           done
         fi