- Timestamp:
- Sep 20, 2024, 5:18:49 PM (3 months ago)
- Location:
- trunk/LMDZ.COMMON
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LMDZ.COMMON/arch/arch-gfortran.fcm
r3298 r3432 1 %COMPILER gfortran2 %LINK gfortran1 %COMPILER mpif90 2 %LINK mpif90 3 3 %AR ar 4 4 %MAKE make … … 8 8 %FPP_DEF NC_DOUBLE 9 9 %BASE_FFLAGS -c -fdefault-real-8 -fdefault-double-8 -ffree-line-length-none -fno-align-commons -fallow-argument-mismatch 10 %PROD_FFLAGS -O 311 %DEV_FFLAGS -O 12 %DEBUG_FFLAGS -f fpe-trap=invalid,zero,overflow -fbounds-check -g3 -O0 -fstack-protector-all -finit-real=snan -fbacktrace10 %PROD_FFLAGS -O2 11 %DEV_FFLAGS -O -Wall -fbounds-check 12 %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 13 13 %C_COMPILER gcc 14 %C_OPTIM -O 315 %MPI_FFLAGS 14 %C_OPTIM -O2 15 %MPI_FFLAGS -I/usr/lib/x86_64-linux-gnu/openmpi/include 16 16 %OMP_FFLAGS 17 %BASE_LD 18 %MPI_LD 17 %BASE_LD 18 %MPI_LD -lmpi 19 19 %OMP_LD -
trunk/LMDZ.COMMON/arch/arch-gfortran.path
r3298 r3432 1 1 ROOT=$PWD 2 NETCDF="$HOME/netcdf4hdf5" 2 3 3 4 NETCDF_LIBDIR="-L$NETCDF/lib" -
trunk/LMDZ.COMMON/libf/evolution/changelog.txt
r3430 r3432 427 427 - Update and corrections for the layering algorithm: there is now only one subsurface stratum. 428 428 - Improvement of the launching script in the case of the 1D PEM: it ends automatically after PCM/PEM run crash. 429 430 == 20/09/2024 == JBC 431 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
r3430 r3432 173 173 echo "Run PCM $iPCM: call $ii/$2..." 174 174 if [ $1 -eq 1 ]; then # 1D model 175 sed -i "s/^k=[0-9]\+$/k=$(echo "3 - $nPCM_ini" | bc -l)/" PCMrun.job175 sed -i "s/^k=[0-9]\+$/k=$(echo "3 - $nPCM_ini" | bc)/" PCMrun.job 176 176 ./PCMrun.job 177 177 if [ $? -ne 0 ]; then … … 181 181 cp PCMrun.job PCMrun${iPCM}.job 182 182 sed -i -E "s/($name_job[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPCM}/" PCMrun${iPCM}.job 183 sed -i "s/^k=[0-9]\+$/k=$(echo "3 - $nPCM_ini" | bc -l)/" PCMrun${iPCM}.job183 sed -i "s/^k=[0-9]\+$/k=$(echo "3 - $nPCM_ini" | bc)/" PCMrun${iPCM}.job 184 184 jobID=$(eval "$submit_job PCMrun${iPCM}.job") 185 185 # Create a file to cancel the dependent jobs of the cycle … … 198 198 echo "Run PCM $iPCM: call $i/$2..." 199 199 if [ $1 -eq 1 ]; then # 1D model 200 sed -i "s/^k=[0-9]\+$/k=$(echo "$i + 2 - $nPCM_ini" | bc -l)/" PCMrun.job200 sed -i "s/^k=[0-9]\+$/k=$(echo "$i + 2 - $nPCM_ini" | bc)/" PCMrun.job 201 201 ./PCMrun.job 202 202 if [ $? -ne 0 ]; then … … 206 206 cp PCMrun.job PCMrun${iPCM}.job 207 207 sed -i -E "s/($name_job[^0-9]*[0-9]*[^0-9]*)[0-9]+$/\1${iPCM}/" PCMrun${iPCM}.job 208 sed -i "s/^k=[0-9]\+$/k=$(echo "$i + 2 - $nPCM_ini" | bc -l)/" PCMrun${iPCM}.job208 sed -i "s/^k=[0-9]\+$/k=$(echo "$i + 2 - $nPCM_ini" | bc)/" PCMrun${iPCM}.job 209 209 jobID=$(eval "$submit_dependjob=afterok:${jobID} PCMrun${iPCM}.job") 210 210 echo $kill_job $jobID >> kill_launchPEM.sh … … 363 363 # arg1: model dimension 364 364 relaunchPEM() { 365 iPEM=$( ($irelaunch + 1))366 iPCM=$( ($nPCM_ini + $nPCM*($irelaunch - 1) + 1))365 iPEM=$(echo "$irelaunch + 1" | bc) 366 iPCM=$(echo "$nPCM_ini + $nPCM*($irelaunch - 1) + 1" | bc) 367 367 i_myear=$(awk "NR==$(($iPEM + 1)) {print \$1}" "info_PEM.txt") 368 368 sed -i "1s/.*/$i_myear $n_myear $convert_years $iPCM $iPEM $nPCM $nPCM_ini/" info_PEM.txt -
trunk/LMDZ.COMMON/libf/evolution/pem.F90
r3430 r3432 1005 1005 call system_clock(c2) 1006 1006 if (stopPEM <= 0 .and. timewall .and. real((c2 - c1)/cr) >= timelimit - antetime) stopPEM = 7 1007 if (stopPEM <=0) then1007 if (stopPEM > 0) then 1008 1008 select case (stopPEM) 1009 1009 case(1) -
trunk/LMDZ.COMMON/libf/evolution/stopping_crit_mod.F90
r3430 r3432 42 42 43 43 !======================================================================= 44 if (stopPEM <0) return44 if (stopPEM > 0) return 45 45 46 46 ! Computation of the present surface of h2o ice still sublimating … … 106 106 107 107 !======================================================================= 108 if (stopPEM <0) return108 if (stopPEM > 0) return 109 109 110 110 ! Computation of the present surface of co2 ice still sublimating
Note: See TracChangeset
for help on using the changeset viewer.