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

Timestamp:

Jul 16, 2025, 3:25:48 PM (10 days ago)

Author:

jbclement

Message:

PEM:

• Making the computation of CO2 mass balance more robust, especially regarding 'CO2cond_ps'.
• Small correction about the dust tendency management for the layering algorithm.
• Small improvement of the visualization in "visu_evol_layering.py".
• File "log_launchPEM.txt" renamed into "launchPEM.log".

JBC

Location:

trunk/LMDZ.COMMON/libf/evolution/deftank

Files:

• PCMrun.job (modified) (1 diff)
• PEMrun.job (modified) (1 diff)
• clean.sh (modified) (1 diff)
• launchPEM.sh (modified) (4 diffs)
• visu_evol_layering.py (modified) (6 diffs)

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

@@ -4 +4 @@
 ### GENOA nodes accommodate 96 cores
 #SBATCH --constraint=GENOA
-### Number of Nodes to use
+### Number of nodes/cores to use
 #SBATCH --nodes=1
 #SBATCH --ntasks-per-node=24

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

@@ -4 +4 @@
 ### GENOA nodes accommodate 96 cores
 #SBATCH --constraint=GENOA
-### Number of Nodes to use
+### Number of nodes/cores to use
 #SBATCH --nodes=1
 #SBATCH --ntasks=1

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

@@ -17 +17 @@
 rm -f *.out
 rm -f kill_launchPEM.sh
-rm -f log_launchPEM.txt
+rm -f launchPEM.log
 rm -f out_run*
 rm -f run.def

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

@@ -48 +48 @@
     # Starting from scratch
     echo "The launching script is starting!"
-    echo "The output file is \"log_launchPEM.txt\"."
-    exec > log_launchPEM.txt 2>&1
+    echo "The output file is \"launchPEM.log\"."
+    exec > launchPEM.log 2>&1
     echo "Beginning of the launching script for the PEM simulation."
     date
@@ -59 +59 @@
     # Starting a new cycle
     if [ $1 = "new" ]; then
-        exec >> log_launchPEM.txt 2>&1
+        exec >> launchPEM.log 2>&1
         echo
         echo "This is a new cycle for the PEM simulation."
@@ -111 +111 @@
             fi
         done
-        exec >> log_launchPEM.txt 2>&1
+        exec >> launchPEM.log 2>&1
         echo
         echo "This is a relaunch for the PEM simulation from the run \"$relaunch $irelaunch\"."
@@ -138 +138 @@
     # Continuing the PEM run
     elif [ $1 = "cont" ]; then
-        exec >> log_launchPEM.txt 2>&1
+        exec >> launchPEM.log 2>&1
         echo
         echo "This is a continuation of the previous PEM run."

trunk/LMDZ.COMMON/libf/evolution/deftank/visu_evol_layering.py

@@ -1030 +1030 @@
     """
     h2o = gridded_data['h2o_ice']
+    co2 = gridded_data['co2_ice']
     dust = gridded_data['dust']
     ngrid, ntime, nslope, nz = h2o.shape
@@ -1077 +1078 @@
         for isl in range(nslope):
             ti = top_index[ig, :, isl].copy().astype(int)
+            frac_all = np.zeros((nz, ntime, 3), dtype=float)  # store fH2O, fCO2, fDust
             for t in range(1, ntime):
                 if ti[t] <= 0:
@@ -1087 +1089 @@
                 if zmax <= 0:
                     continue
+                cH2O = np.clip(h2o[ig, t, isl, :zmax], 0, None)
+                cCO2 = np.clip(co2[ig, t, isl, :zmax], 0, None)
+                cDust = np.clip(dust[ig, t, isl, :zmax], 0, None)
+                total = cH2O + cCO2 + cDust
+                total[total == 0] = 1.0
+                fH2O = cH2O / total
+                fCO2 = cCO2 / total
+                fDust = cDust / total
+                frac_all[:zmax, t, :] = np.stack([fH2O, fCO2, fDust], axis=1)
 
                 h2o_profile = np.clip(h2o[ig, t, isl, :zmax], 0, None)
@@ -1105 +1116 @@
             ratio_array = 10**log_ratio_array
             ratio_display = ratio_array[elevation_mask, :]
+            display_frac = frac_all[elevation_mask, :, :]
 
             # Plot
@@ -1117 +1129 @@
             )
             x_edges = np.concatenate([date_time, [date_time[-1] + (date_time[-1]-date_time[-2])]])
-            attach_format_coord(ax, ratio_display, x_edges, np.concatenate([elev, [elev[-1] + (elev[-1]-elev[-2])]]), is_pcolormesh=True)
+            y_edges = np.concatenate([elev, [elev[-1] + (elev[-1]-elev[-2])]])
+            def format_coord_all(x, y):
+                # check bounds
+                if x < x_edges[0] or x > x_edges[-1] or y < y_edges[0] or y > y_edges[-1]:
+                    return ''
+                # locate cell
+                i = np.searchsorted(x_edges, x) - 1
+                j = np.searchsorted(y_edges, y) - 1
+                i = np.clip(i, 0, display_frac.shape[1]-1)
+                j = np.clip(j, 0, display_frac.shape[0]-1)
+                # get fractions
+                fH2O  = display_frac[j, i, 0]
+                fDust = display_frac[j, i, 2]
+                obl   = np.interp(x, date_time, obliquity)
+                return f"Time={x:.2f}, Elev={y:.2f}, H2O={fH2O:.2f}, Dust={fDust:.2f}, Obl={obl:.2f}°"
+
+            ax.format_coord = format_coord_all
             ax.set_title(f"Dust-to-Ice ratio over time (Grid point {ig+1}, Slope {isl+1})", fontweight='bold')
             ax.set_xlabel('Time (Mars years)')
@@ -1138 +1166 @@
                     linewidth=1.5
                 )
+            ax2.format_coord = format_coord_all
             ax2.set_ylabel('Obliquity (°)')
             ax2.tick_params(axis='y')