Changeset 3106

Timestamp:

Oct 26, 2023, 11:30:35 AM (21 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

Files:

• LMDZ.COMMON/libf/evolution/changelog.txt (modified) (1 diff)
• LMDZ.COMMON/libf/evolution/reshape_XIOS_output.F90 (modified) (2 diffs)
• LMDZ.MARS/deftank/file_def_physics_mars.xml (modified) (5 diffs)
• LMDZ.MARS/deftank/pem/launch_pem.sh (modified) (1 diff)
• LMDZ.MARS/libf/phymars/physiq_mod.F (modified) (1 diff)
• LMDZ.MARS/libf/phymars/vdifc_mod.F (modified) (1 diff)

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

@@ -120 +120 @@
 Following r3095, 'iniorbit' is now a subroutine of "planete_h.F90".
 Correction of a bug from r3088: "diagfi.nc" was not changed into "diagpem.nc" in the commited version of "writediagpem.F90"!
+
+== 26/10/2023 == JBC
+    - 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.

trunk/LMDZ.COMMON/libf/evolution/reshape_XIOS_output.F90

@@ -15 +15 @@
 
 integer                               :: state, ncid, ncid1, ncid2, nDims, nVars, nGlobalAtts, unlimDimID
-integer                               :: i, j, include_parents
+integer                               :: i, j, include_parents, cstat
 integer, dimension(:),    allocatable :: dimids, varids, dimids_2, varids_2, dimid_var
 real, dimension(:),       allocatable :: tempvalues_1d, values_1d
@@ -21 +21 @@
 real, dimension(:,:,:),   allocatable :: tempvalues_3d, values_3d
 real, dimension(:,:,:,:), allocatable :: tempvalues_4d, values_4d
-character(1)                          :: str2
+character(1)                          :: str
 character(30)                         :: name_, namevar
 integer                               :: xtype_var, len_, len_1, len_2, len_lat, len_lon, len_time, len_soil
 integer                               :: dimid_lon, dimid_lat, dimid_time, dimid_soil, dimid_2, numdims, numatts, numyear
+logical                               :: yes
 
 do numyear = 1,2
     write(*,*) 'numyear',numyear
-    write(str2(1:1),'(i1.1)') numyear
+    write(str(1:1),'(i1.1)') numyear
     !nf90_open                 ! open existing netCDF dataset
     !integer :: ncid, state
     !...
-    state = nf90_open(path = "data2reshape"//str2//".nc", mode = nf90_nowrite, ncid = ncid1)
-    if (state /= nf90_noerr) call handle_err(state)
-
-    state = nf90_create(path = "data_PCM_Y"//str2//".nc", cmode=or(nf90_noclobber,nf90_64bit_offset), ncid = ncid2)
+    state = nf90_open(path = "data2reshape"//str//".nc", mode = nf90_nowrite, ncid = ncid1)
+    if (state /= nf90_noerr) call handle_err(state)
+
+    inquire(file = 'data_PCM_Y'//str//'.nc', exist = yes)
+    if (yes) then
+        call execute_command_line('rm data_PCM_Y'//str//'.nc',cmdstat = cstat)
+        if (cstat > 0) then
+            error stop 'Command exection failed!'
+        else if (cstat < 0) then
+            error stop 'Command execution not supported!'
+        endif
+    endif
+    state = nf90_create(path = "data_PCM_Y"//str//".nc", cmode=or(nf90_noclobber,nf90_64bit_offset), ncid = ncid2)
     if (state /= nf90_noerr) call handle_err(state)
 

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

trunk/LMDZ.MARS/libf/phymars/physiq_mod.F

@@ -3890 +3890 @@
         ENDDO
 
+      CALL write_output("Waterdensity_soil",
+     &     "rhowater_soil",'kg.m-3',
+     &     rhowater_soil(:,:,iflat))
+      CALL write_output("Waterdensity_surface",
+     &     "rhowater_surface",'kg.m-3',
+     &     rhowater_surf(:,iflat))
       DO islope = 1,nslope
         write(str2(1:2),'(i2.2)') islope

trunk/LMDZ.MARS/libf/phymars/vdifc_mod.F

@@ -1078 +1078 @@
 c             pdqsdif > 0 : ice condensing
 c             pdqsdif < 0 : ice subliming
-             write(*,*) "subliming more than available frost:  qsurf!"
+c             write(*,*) "subliming more than available frost:  qsurf!"
                   zdqsdif(ig)=
      &                        -zqsurf(ig)/subtimestep