Changeset 3790 for trunk

Timestamp:

Jun 3, 2025, 5:22:03 PM (3 weeks ago)

Author:

jbclement

Message:

PEM:
Correction of a small bug for the launching script when restarting the simulation from an initial PCM run + renaming of variables in the visualization scripts for the layering structure.
JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• deftank/lib_launchPEM.sh (modified) (1 diff)
• deftank/visu_evol_layering.py (modified) (1 diff)
• deftank/visu_layering.py (modified) (6 diffs)

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

@@ -695 +695 @@
 == 03/06/2025 == JBC
 Few corrections for the layering algorithm, in particular when a dust lag layer is created.
+
+== 03/06/2025 == JBC
+Correction of a small bug for the launching script when restarting the simulation from an initial PCM run + renaming of variables in the visualization scripts for the layering structure

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

@@ -333 +333 @@
         cleanfiles starts/restartpem .nc $(($iPEM - 1))
         rm -f startpem.nc
+        if [ -f "starts/startpem.nc" ]; then
+            cp starts/startpem.nc .
+        fi
         if [ $irelaunch -eq $(($nPCM_ini - 1)) ]; then
             cp diags/data2reshape${irelaunch}.nc data2reshape_Y1.nc

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

@@ -106 +106 @@
         'dust':      'h_dust',
         'pore':      'h_pore',
-        'pore_ice':  'icepore_volfrac'
+        'pore_ice':  'poreice_volfrac'
     }
     var_info = {prop: set() for prop in property_markers}

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

@@ -55 +55 @@
         'h_h2o': f"stratif_slope{idx_str}_h_h2oice",
         'h_dust': f"stratif_slope{idx_str}_h_dust",
-        'h_air': f"stratif_slope{idx_str}_h_pore",
-        'volfrac': f"stratif_slope{idx_str}_icepore_volfrac",
+        'h_pore': f"stratif_slope{idx_str}_h_pore",
+        'poreice_volfrac': f"stratif_slope{idx_str}_poreice_volfrac",
     }
 
@@ -82 +82 @@
     h_h2o = data['h_h2o']
     h_dust = data['h_dust']
-    h_air = data['h_air']
-    volfrac = data['volfrac']
+    h_pore = data['h_pore']
+    poreice_volfrac = data['poreice_volfrac']
 
     layers = top.shape[1]
@@ -94 +94 @@
         + h_h2o[0, 0, grid_index]
         + h_dust[0, 0, grid_index]
-        + h_air[0, 0, grid_index]
+        + h_pore[0, 0, grid_index]
     )
     raw_height[0] = top[0, 0, grid_index] - total_thickness0
@@ -104 +104 @@
             + h_h2o[0, i, grid_index]
             + h_dust[0, i, grid_index]
-            + h_air[0, i, grid_index]
+            + h_pore[0, i, grid_index]
         )
 
@@ -135 +135 @@
         h2o = h_h2o[0, layer_idx, grid_index] / thickness
         dust = h_dust[0, layer_idx, grid_index] / thickness
-        air = h_air[0, layer_idx, grid_index] * (1.0 - volfrac[0, layer_idx, grid_index]) / thickness
-        pore = h_air[0, layer_idx, grid_index] * volfrac[0, layer_idx, grid_index] / thickness
-        contents[:, idx + 1] = [co2, h2o, dust, air, pore]
+        air = h_pore[0, layer_idx, grid_index] * (1.0 - poreice_volfrac[0, layer_idx, grid_index]) / thickness
+        poreice = h_pore[0, layer_idx, grid_index] * poreice_volfrac[0, layer_idx, grid_index] / thickness
+        contents[:, idx + 1] = [co2, h2o, dust, air, poreice]
 
     if num_filt > 0:
@@ -276 +276 @@
         h_h2o = slope_data['h_h2o']
         h_dust = slope_data['h_dust']
-        h_air = slope_data['h_air']
+        h_pore = slope_data['h_pore']
         total_thickness0 = (
             h_co2[0, 0, igrid_input]
             + h_h2o[0, 0, igrid_input]
             + h_dust[0, 0, igrid_input]
-            + h_air[0, 0, igrid_input]
+            + h_pore[0, 0, igrid_input]
         )
         raw_height[0] = top[0, 0, igrid_input] - total_thickness0