Changeset 3432 for trunk

Timestamp:

Sep 20, 2024, 5:18:49 PM (2 months ago)

Author:

jbclement

Message:

PEM:
Small corrections for the launching script (run numbers must be integer) and the PEM stopping criteria algorithm related to r3430.
JBC

Location:

trunk/LMDZ.COMMON

Files:

• arch/arch-gfortran.fcm (modified) (2 diffs)
• arch/arch-gfortran.path (modified) (1 diff)
• libf/evolution/changelog.txt (modified) (1 diff)
• libf/evolution/deftank/lib_launchPEM.sh (modified) (5 diffs)
• libf/evolution/pem.F90 (modified) (1 diff)
• libf/evolution/stopping_crit_mod.F90 (modified) (2 diffs)

trunk/LMDZ.COMMON/arch/arch-gfortran.fcm

@@ -1 @@
-%COMPILER            gfortran
-%LINK                gfortran
+%COMPILER            mpif90
+%LINK                mpif90
 %AR                  ar
 %MAKE                make
@@ -8 +8 @@
 %FPP_DEF             NC_DOUBLE
 %BASE_FFLAGS         -c -fdefault-real-8 -fdefault-double-8 -ffree-line-length-none -fno-align-commons -fallow-argument-mismatch
-%PROD_FFLAGS         -O3
-%DEV_FFLAGS          -O
-%DEBUG_FFLAGS        -ffpe-trap=invalid,zero,overflow -fbounds-check -g3 -O0 -fstack-protector-all -finit-real=snan -fbacktrace
+%PROD_FFLAGS         -O2
+%DEV_FFLAGS          -O -Wall -fbounds-check
+%DEBUG_FFLAGS        -fcheck=all -ffree-line-length-0 -Wall -ffpe-trap=invalid,zero,overflow -fbounds-check -g3 -O0 -fstack-protector-all -finit-real=nan -fbacktrace
 %C_COMPILER          gcc
-%C_OPTIM             -O3
-%MPI_FFLAGS
+%C_OPTIM             -O2
+%MPI_FFLAGS          -I/usr/lib/x86_64-linux-gnu/openmpi/include
 %OMP_FFLAGS         
-%BASE_LD     
-%MPI_LD
+%BASE_LD             
+%MPI_LD              -lmpi
 %OMP_LD              

trunk/LMDZ.COMMON/arch/arch-gfortran.path

@@ -1 +1 @@
 ROOT=$PWD
+NETCDF="$HOME/netcdf4hdf5"
 
 NETCDF_LIBDIR="-L$NETCDF/lib"

trunk/LMDZ.COMMON/libf/evolution/changelog.txt

@@ -427 +427 @@
 - Update and corrections for the layering algorithm: there is now only one subsurface stratum.
 - Improvement of the launching script in the case of the 1D PEM: it ends automatically after PCM/PEM run crash.
+
+== 20/09/2024 == JBC
+Small corrections for the launching script (run numbers must be integer) and the PEM stopping criteria algorithm related to r3430.

trunk/LMDZ.COMMON/libf/evolution/deftank/lib_launchPEM.sh

@@ -173 +173 @@
         echo "Run PCM $iPCM: call $ii/$2..."
         if [ $1 -eq 1 ]; then # 1D model
-            sed -i "s/^k=[0-9]\+$/k=$(echo "3 - $nPCM_ini" | bc -l)/" PCMrun.job
+            sed -i "s/^k=[0-9]\+$/k=$(echo "3 - $nPCM_ini" | bc)/" PCMrun.job
             ./PCMrun.job
             if [ $? -ne 0 ]; then
@@ -181 +181 @@
             cp PCMrun.job PCMrun${iPCM}.job
             sed -i -E "s/($name_job[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPCM}/" PCMrun${iPCM}.job
-            sed -i "s/^k=[0-9]\+$/k=$(echo "3 - $nPCM_ini" | bc -l)/" PCMrun${iPCM}.job
+            sed -i "s/^k=[0-9]\+$/k=$(echo "3 - $nPCM_ini" | bc)/" PCMrun${iPCM}.job
             jobID=$(eval "$submit_job PCMrun${iPCM}.job")
             # Create a file to cancel the dependent jobs of the cycle
@@ -198 +198 @@
             echo "Run PCM $iPCM: call $i/$2..."
             if [ $1 -eq 1 ]; then # 1D model
-                sed -i "s/^k=[0-9]\+$/k=$(echo "$i + 2 - $nPCM_ini" | bc -l)/" PCMrun.job
+                sed -i "s/^k=[0-9]\+$/k=$(echo "$i + 2 - $nPCM_ini" | bc)/" PCMrun.job
                 ./PCMrun.job
                 if [ $? -ne 0 ]; then
@@ -206 +206 @@
                 cp PCMrun.job PCMrun${iPCM}.job
                 sed -i -E "s/($name_job[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPCM}/" PCMrun${iPCM}.job
-                sed -i "s/^k=[0-9]\+$/k=$(echo "$i + 2 - $nPCM_ini" | bc -l)/" PCMrun${iPCM}.job
+                sed -i "s/^k=[0-9]\+$/k=$(echo "$i + 2 - $nPCM_ini" | bc)/" PCMrun${iPCM}.job
                 jobID=$(eval "$submit_dependjob=afterok:${jobID} PCMrun${iPCM}.job")
                 echo $kill_job $jobID >> kill_launchPEM.sh
@@ -363 +363 @@
 # arg1: model dimension
 relaunchPEM() {
-    iPEM=$(($irelaunch + 1))
-    iPCM=$(($nPCM_ini + $nPCM*($irelaunch - 1) + 1))
+    iPEM=$(echo "$irelaunch + 1" | bc)
+    iPCM=$(echo "$nPCM_ini + $nPCM*($irelaunch - 1) + 1" | bc)
     i_myear=$(awk "NR==$(($iPEM + 1)) {print \$1}" "info_PEM.txt")
     sed -i "1s/.*/$i_myear $n_myear $convert_years $iPCM $iPEM $nPCM $nPCM_ini/" info_PEM.txt

trunk/LMDZ.COMMON/libf/evolution/pem.F90

@@ -1005 +1005 @@
     call system_clock(c2)
     if (stopPEM <= 0 .and. timewall .and. real((c2 - c1)/cr) >= timelimit - antetime) stopPEM = 7
-    if (stopPEM <= 0) then
+    if (stopPEM > 0) then
         select case (stopPEM)
             case(1)

trunk/LMDZ.COMMON/libf/evolution/stopping_crit_mod.F90

@@ -42 +42 @@
 
 !=======================================================================
-if (stopPEM < 0) return
+if (stopPEM > 0) return
 
 ! Computation of the present surface of h2o ice still sublimating
@@ -106 +106 @@
 
 !=======================================================================
-if (stopPEM < 0) return
+if (stopPEM > 0) return
 
 ! Computation of the present surface of co2 ice still sublimating