Changeset 4152 for trunk/LMDZ.COMMON/libf/evolution/deftank

Timestamp:

Mar 25, 2026, 11:19:02 AM (13 days ago)

Author:

jbclement

Message:

PEM:

• Fix outputs "diagevo.nc" for 3D data.
• Fix sign in computing exchanges due to adsorption/ice table and in balancing H2O flux from/into atmosphere.
• Few cleanings.

JBC

Location:

trunk/LMDZ.COMMON/libf/evolution/deftank

Files:

• README (modified) (1 diff)
• clean.sh (modified) (1 diff)
• pcm_run.job (modified) (1 diff)
• pem_workflow_lib.sh (modified) (4 diffs)

trunk/LMDZ.COMMON/libf/evolution/deftank/README

@@ -62 +62 @@
 The PEM simulation generates the following files:
     > the usual outputs of the PCM: "restartfi.nc", "restart.nc"/"restart1D.txt", "diagfi.nc", etc;
-    > the XIOS outputs of the PCM: "Xoutdaily4pem*.nc"/"Xoutyearly4pem*.nc";
+    > the XIOS outputs of the PCM: "xoutdaily4pem*.nc"/"xoutyearly4pem*.nc";
     > the outputs of the chained simulation: "pem_workflow.log", "pem_workflow.sts" and possibly "kill_pem_workflow.sh";
     > the usual outputs of the PEM: "restartevo.nc", "restartfi.nc", "restart.nc"/"restart1D.txt" and "diagevo.nc".

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

@@ -19 +19 @@
 rm -f start*.nc
 rm -f used_*
-rm -f Xout*4pem*.nc
+rm -f xout*4pem*.nc
 rm -f xios_client_*
 rm -f diag*.nc

trunk/LMDZ.COMMON/libf/evolution/deftank/pcm_run.job

@@ -65 +65 @@
 k=0
 if [ $(echo "$k > 0" | bc) -eq 1 ]; then # Only the last 2 years are taken for the PEM
-    cp Xoutdaily4pem.nc Xoutdaily4pem_Y${k}.nc
-    cp Xoutyearly4pem.nc Xoutyearly4pem_Y${k}.nc
+    cp xoutdaily4pem.nc xoutdaily4pem_y${k}.nc
+    cp xoutyearly4pem.nc xoutyearly4pem_y${k}.nc
 fi
-mv Xoutdaily4pem.nc diags/Xoutdaily4pem${i_pcm_run}.nc
-mv Xoutyearly4pem.nc diags/Xoutyearly4pem${i_pcm_run}.nc
+mv xoutdaily4pem.nc diags/xoutdaily4pem${i_pcm_run}.nc
+mv xoutyearly4pem.nc diags/xoutyearly4pem${i_pcm_run}.nc
 cp restartfi.nc starts/restartfi${i_pcm_run}.nc
 mv restartfi.nc startfi.nc

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

@@ -498 +498 @@
     cleanup diags/diagfi .nc $i_resume
     cleanup diags/diagsoil .nc $i_resume
-    cleanup diags/Xoutdaily4pem .nc $i_resume
-    cleanup diags/Xoutyearly4pem .nc $i_resume
+    cleanup diags/xoutdaily4pem .nc $i_resume
+    cleanup diags/xoutyearly4pem .nc $i_resume
     cleanup logs/run_pcm .log $i_resume
     cleanup starts/restart1D .txt $i_resume
@@ -527 +527 @@
         fi
         if [ $i_resume -eq $(($n_pcm_runs_ini - 1)) ]; then
-            cp diags/Xoutdaily4pem${i_resume}.nc Xoutdaily4pem_Y1.nc
-            cp diags/Xoutyearly4pem${i_resume}.nc Xoutyearly4pem_Y1.nc
+            cp diags/xoutdaily4pem${i_resume}.nc xoutdaily4pem_y1.nc
+            cp diags/xoutyearly4pem${i_resume}.nc xoutyearly4pem_y1.nc
             submit_cycle $1 $n_pcm_runs_ini $i_pcm_run
         elif [ $i_resume -eq $n_pcm_runs_ini ]; then
-            cp diags/Xoutdaily4pem$(($i_resume - 1)).nc Xoutdaily4pem_Y1.nc
-            cp diags/Xoutyearly4pem$(($i_resume - 1)).nc Xoutyearly4pem_Y1.nc
-            cp diags/Xoutdaily4pem${i_resume}.nc Xoutdaily4pem_Y2.nc
-            cp diags/Xoutyearly4pem${i_resume}.nc Xoutyearly4pem_Y2.nc
+            cp diags/xoutdaily4pem$(($i_resume - 1)).nc xoutdaily4pem_y1.nc
+            cp diags/xoutyearly4pem$(($i_resume - 1)).nc xoutyearly4pem_y1.nc
+            cp diags/xoutdaily4pem${i_resume}.nc xoutdaily4pem_y2.nc
+            cp diags/xoutyearly4pem${i_resume}.nc xoutyearly4pem_y2.nc
             submit_pem_phase $1 # The next job is a PEM run
         else
@@ -554 +554 @@
         cp starts/restartevo$(($i_pem_run - 1)).nc startevo.nc
         if [ $il -eq $(($n_pcm_runs - 1)) ]; then # Second to last PCM run
-            cp diags/Xoutdaily4pem${i_resume}.nc Xoutdaily4pem_Y1.nc
-            cp diags/Xoutyearly4pem${i_resume}.nc Xoutyearly4pem_Y1.nc
+            cp diags/xoutdaily4pem${i_resume}.nc xoutdaily4pem_y1.nc
+            cp diags/xoutyearly4pem${i_resume}.nc xoutyearly4pem_y1.nc
             submit_cycle $1 $n_pcm_runs $(($il + 1))
         elif [ $il -eq $n_pcm_runs ]; then # Last PCM run so the next job is a PEM run
-            cp diags/Xoutdaily4pem$(($i_resume - 1)).nc Xoutdaily4pem_Y1.nc
-            cp diags/Xoutyearly4pem$(($i_resume - 1)).nc Xoutyearly4pem_Y1.nc
-            cp diags/Xoutdaily4pem${i_resume}.nc Xoutdaily4pem_Y2.nc
-            cp diags/Xoutyearly4pem${i_resume}.nc Xoutyearly4pem_Y2.nc
+            cp diags/xoutdaily4pem$(($i_resume - 1)).nc xoutdaily4pem_y1.nc
+            cp diags/xoutyearly4pem$(($i_resume - 1)).nc xoutyearly4pem_y1.nc
+            cp diags/xoutdaily4pem${i_resume}.nc xoutdaily4pem_y2.nc
+            cp diags/xoutyearly4pem${i_resume}.nc xoutyearly4pem_y2.nc
             submit_pem_phase $1
         else
@@ -582 +582 @@
     cleanup starts/restart .nc $(($i_pcm_run - 1))
     cleanup starts/restartfi .nc $(($i_pcm_run - 1))
-    cleanup diags/Xoutdaily4pem .nc $(($i_pcm_run - 1))
-    cleanup diags/Xoutyearly4pem .nc $(($i_pcm_run - 1))
+    cleanup diags/xoutdaily4pem .nc $(($i_pcm_run - 1))
+    cleanup diags/xoutyearly4pem .nc $(($i_pcm_run - 1))
     cleanup diags/diagevo .nc $i_resume
     cleanup diags/diagevo_soil .nc $i_resume