Changeset 3106 for trunk/LMDZ.MARS/deftank

Timestamp:

Oct 26, 2023, 11:30:35 AM (15 months ago)

Author:

jbclement

Message:

PEM:

• Correction of a bug when running with ifort, XIOS and no sub-slopes. If compiled with ifort, the 'Reshape' program cashed because of sub-slopes variables were written in the XIOS output but not filled. A new file definition without sub-slopes can be chosen in the xml file to avoid this issue.
• Addition in the 'Reshape' program of a check to remove the output files if they exist to prevent a crash.

JBC

Location:

trunk/LMDZ.MARS/deftank

Files:

• file_def_physics_mars.xml (modified) (5 diffs)
• pem/launch_pem.sh (modified) (1 diff)

trunk/LMDZ.MARS/deftank/file_def_physics_mars.xml

@@ -81 +81 @@
         </file>
 
-        <!-- FILE 3 :diurnal averages outputs for PEM; output_freq is every day -->
+        <!-- FILE 3 :diurnal averages outputs for PEM without sub-slope; output_freq is every day -->
         <file id="diurnalave"
               name="Xdiurnalave"
@@ -88 +88 @@
               time_units="days"
               enabled=".true.">
+                    
+            <!-- VARS 0D -->
+            <field_group operation="average"
+                         freq_op="1ts">
+                <field field_ref="Ls" />
+            </field_group>
+
+            <field_group operation="average"
+                         freq_op="1ts">
+                <field field_ref="area" operation="once" />
+                <field field_ref="ps" />
+                <field field_ref="tsurf" />
+                <field field_ref="Waterdensity_surface" />
+                <field field_ref="h2o_layer1" />
+                <field field_ref="co2_layer1" />
+                <field field_ref="fluxsurf_dn_sw" name="ISR" />
+                <field field_ref="fluxtop_dn_sw" name="insolation" />
+            </field_group>
+
+            <field_group operation="minimum"
+                         freq_op="1ts">
+                <field field_ref="co2ice" />
+                <field field_ref="h2o_ice_s" />
+                <field field_ref="watercap" />
+            </field_group>
+
+            <!-- VARS soil -->
+            <field_group operation="average"
+                         freq_op="1ts">
+                <field field_ref="soiltemp" />
+                <field field_ref="Waterdensity_soil" />
+            </field_group>
+        </file>
+
+        <!-- FILE 4 :diurnal averages outputs for PEM with sub-slopes; output_freq is every day -->
+        <file id="diurnalave_s"
+              name="Xdiurnalave_s"
+              output_freq="1d"
+              type="one_file"
+              time_units="days"
+              enabled=".false.">
                     
             <!-- VARS 0D -->
@@ -107 +148 @@
                 <field field_ref="tsurf_slope06" />
                 <field field_ref="tsurf_slope07" />
+                <field field_ref="Waterdensity_surface" />
                 <field field_ref="Waterdensity_surface01" />
                 <field field_ref="Waterdensity_surface02" />
@@ -138 +180 @@
                 <field field_ref="h2o_ice_s_slope06" />
                 <field field_ref="h2o_ice_s_slope07" />
+                <field field_ref="watercap" />
                 <field field_ref="watercap_slope01" />
                 <field field_ref="watercap_slope02" />
@@ -158 +201 @@
                 <field field_ref="soiltemp_slope06" />
                 <field field_ref="soiltemp_slope07" />
+                <field field_ref="Waterdensity_soil" />
                 <field field_ref="Waterdensity_soil_slope01" />
                 <field field_ref="Waterdensity_soil_slope02" />

trunk/LMDZ.MARS/deftank/pem/launch_pem.sh

@@ -167 +167 @@
     # Copy data files and prepare the next run
     mv out_runPEM${iPEM} out_PEM/run${iPEM}
-    mv diagpem.nc diags/diagpem_${iPEM}.nc
-    cp restartpem.nc starts/startpem_${iPEM}.nc
+    mv diagpem.nc diags/diagpem${iPEM}.nc
+    cp restartpem.nc starts/startpem${iPEM}.nc
     mv restartpem.nc startpem.nc
     cp restartfi_evol.nc starts/startfi_postPEM${iPEM}.nc