Changeset 2643

Timestamp:

Oct 2, 2016, 6:28:02 PM (8 years ago)

Author:

Ehouarn Millour

Message:

• move iophys.F90 to phylmd since it depends on files there (with some modifications, iophys.F90 could be made generic enough to be in phy_common).
• some adaptations to make phydev XIOS2 compliant.

EM

Location:

LMDZ5/trunk

Files:

• DefLists/iodef_dev.xml (modified) (8 diffs)
• libf/dynphy_lonlat/phydev/callphysiq_mod.F90 (modified) (2 diffs)
• libf/phydev/physiq_mod.F90 (modified) (2 diffs)
• libf/phylmd/iophys.F90 (moved) (moved from LMDZ5/trunk/libf/phy_common/iophys.F90)

LMDZ5/trunk/DefLists/iodef_dev.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 <simulation> 
-    <context id="LMDZ" calendar_type="D360" start_date="1980-01-01 00:00:00">
+    <context id="LMDZ">
+        
+        <!-- <calendar type="D360" start_date="1980-01-01 00:00:00" /> -->
+        
         <!-- Definition of model variables -->
         <field_definition prec="4" 
@@ -16 +19 @@
             <!-- 3D variables -->
             <field_group id="fields_3D"
-                         domain_ref="dom_glo">
+                         domain_ref="dom_glo" axis_ref="presnivs">
                 <field id="temperature"
                        long_name="Atmospheric temperature"
@@ -39 +42 @@
                       name="Xhistins"
                       output_freq="12ts" 
+                      type="one_file"
                       enabled=".TRUE."> <!-- NB: output_freq in physics ts-->
                     
@@ -46 +50 @@
                         <field field_ref="ps" />
                     </field_group>
-                    <!-- <field_group field_group_ref="fields_2D"
-                                 operation="instant" /> doesn't work ?!? -->
 
                     <!-- VARS 3D -->
@@ -58 +60 @@
                         <field field_ref="v" />
                     </field_group>
-                    <!-- <field_group field_group_ref="fields_3D"
-                                 operation="instant" /> doesn't work ?!? -->
                 </file>
 
@@ -65 +65 @@
                       name="Xdiurnalave"
                       output_freq="1d"
+                      type="one_file"
                       enabled=".true.">
                     <!-- VARS 2D -->
@@ -93 +94 @@
              wxios_add_vaxis -->
         <axis_definition>
-            <!--
-            <axis_group id="presnivs" 
-                        standard_name="Pseudo-pressure of model vertical levels" 
-                        unit="Pa">
-            </axis_group>
-            -->
             <axis id="presnivs" 
                         standard_name="Pseudo-pressure of model vertical levels" 
@@ -114 +109 @@
 
             <variable_group id="parameters" >
-                <variable id="using_server" type="boolean">true</variable>
+                <variable id="using_server" type="bool">false</variable>
                 <variable id="info_level" type="int">10</variable>
             </variable_group>

LMDZ5/trunk/libf/dynphy_lonlat/phydev/callphysiq_mod.F90

@@ -12 +12 @@
                        jD_cur,jH_cur_split,zdt_split,                     &
                        zplev_omp,zplay_omp,                               &
-                       zphi_omp,zphis_omp,                                &
+                       zpk_omp,zphi_omp,zphis_omp,                        &
                        presnivs_omp,                                      &
                        zufi_omp,zvfi_omp,zrfi_omp,ztfi_omp,zqfi_omp,      &
@@ -34 +34 @@
   REAL,INTENT(IN) :: zplev_omp(klon,llm+1) ! interlayer pressure (Pa)
   REAL,INTENT(IN) :: zplay_omp(klon,llm) ! mid-layer pressure (Pa)
+  REAL,INTENT(IN) :: zpk_omp(klon,llm) ! Exner function
   REAL,INTENT(IN) :: zphi_omp(klon,llm) ! geopotential at midlayer
   REAL,INTENT(IN) :: zphis_omp(klon) ! surface geopotential

LMDZ5/trunk/libf/phydev/physiq_mod.F90

@@ -25 +25 @@
 #ifdef CPP_XIOS
       USE xios, ONLY: xios_update_calendar
-      USE wxios, only: wxios_add_vaxis, wxios_set_timestep, wxios_closedef, &
-                       histwrite_phy
+      USE wxios, only: wxios_add_vaxis, wxios_set_cal, wxios_closedef
+      USE iophy, ONLY: histwrite_phy
 #endif
 
@@ -129 +129 @@
 !XIOS
     ! Declare available vertical axes to be used in output files:    
-    !CALL wxios_add_vaxis("presnivs", "dummy-not-used", klev, presnivs)
     CALL wxios_add_vaxis("presnivs", klev, presnivs)
 
-    ! Declare time step length (in s):
-    CALL wxios_set_timestep(dtime)
-
+    ! Declare calendar and time step
+    CALL wxios_set_cal(dtime,"earth_360d",1,1,1,0.0,1,1,1,0.0)
+    
     !Finalize the context:
     CALL wxios_closedef()
 #endif
 !$OMP END MASTER
+!$OMP BARRIER
 endif ! of if (debut)