Changeset 1626 for trunk/LMDZ.GENERIC

Timestamp:

Nov 10, 2016, 6:35:57 AM (8 years ago)

Author:

emillour

Message:

Generic GCM:

Improving XIOS outputs, add the scalar case.
EM

Location:

trunk/LMDZ.GENERIC

Files:

• deftank/context_lmdz_physics.xml (modified) (5 diffs)
• libf/phystd/physiq_mod.F90 (modified) (1 diff)
• libf/phystd/xios_output_mod.F90 (modified) (2 diffs)

trunk/LMDZ.GENERIC/deftank/context_lmdz_physics.xml

@@ -22 +22 @@
     </axis_definition>
     
-    <!-- toggle axis id below to change output vertical axis -->
-    <grid id="grid_3d">
-        <domain id="dom_glo" />
-        <!-- <axis id="presnivs" /> -->
-        <axis id="altitude" />
-    </grid>
+    <grid_definition>
+        <!-- toggle axis id below to change output vertical axis -->
+        <grid id="grid_3d">
+            <domain id="dom_glo" />
+                <!-- <axis id="presnivs" /> -->
+                <axis id="altitude" /> 
+        </grid>
+        <!-- to output scalars -->
+        <grid id="scalarpoint" >
+            <scalar />
+        </grid>
+    </grid_definition>
     
     <!-- Definition of model variables -->
@@ -33 +39 @@
                       freq_op="1ts"
                       enabled=".TRUE.">
-            
+        
+        <!-- 0D variables -->
+        <field_group id="fields_0D" grid_ref="scalarpoint">
+            <field id="ls"
+                   long_name="Solar longitude"
+                   unit="degrees" />
+        </field_group>    
+        
         <!-- 2D variables -->
         <field_group id="fields_2D" domain_ref="dom_glo">
@@ -45 +58 @@
 
         <!-- 3D variables -->
-        <field_group id="fields_3D" domain_ref="dom_glo" axis_ref="altitude">
-        <!-- <field_group id="fields_3D" grid_ref="grid_3d"> --> <!-- doesn't work... why? -->
+        <field_group id="fields_3D" grid_ref="grid_3d">
             <field id="temperature"
                    long_name="Atmospheric temperature"
@@ -69 +81 @@
               enabled=".true.">
                     
+            <!-- VARS 0D -->
+            <field_group operation="instant"
+                         freq_op="1ts">
+                <field field_ref="ls" />
+            </field_group>
+
             <!-- VARS 2D -->
             <field_group operation="instant"
@@ -92 +110 @@
               enabled=".true.">
                     
+            <!-- VARS 0D -->
+            <field_group operation="average"
+                         freq_op="1ts">
+                <field field_ref="ls" />
+            </field_group>
+
             <!-- VARS 2D -->
             <field_group operation="average"

trunk/LMDZ.GENERIC/libf/phystd/physiq_mod.F90

@@ -2152 +2152 @@
       ! Send fields to XIOS: (NB these fields must also be defined as
       ! <field id="..." /> in context_lmdz_physics.xml to be correctly used)
+      CALL send_xios_field("ls",zls)
+      
       CALL send_xios_field("ps",ps)
       CALL send_xios_field("area",cell_area)

trunk/LMDZ.GENERIC/libf/phystd/xios_output_mod.F90

@@ -11 +11 @@
 
  INTERFACE send_xios_field
-    MODULE PROCEDURE histwrite2d_xios,histwrite3d_xios
+    MODULE PROCEDURE histwrite0d_xios,histwrite2d_xios,histwrite3d_xios
  END INTERFACE
  
@@ -151 +151 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
+  SUBROUTINE histwrite0d_xios(field_name,field)
+  USE xios, ONLY: xios_send_field
+  USE print_control_mod, ONLY: prt_level, lunout
+  IMPLICIT NONE
+  
+    CHARACTER(LEN=*), INTENT(IN) :: field_name
+    REAL, INTENT(IN) :: field
+    
+    IF (prt_level >= 10) WRITE(lunout,*)'Begin histrwrite0d_xios ',trim(field_name)
+    
+!$OMP MASTER
+    CALL xios_send_field(field_name,field)
+!$OMP END MASTER
+    
+    IF (prt_level >= 10) WRITE(lunout,*)'End histrwrite0d_xios ',trim(field_name)
+    
+  END SUBROUTINE histwrite0d_xios
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
   SUBROUTINE histwrite2d_xios(field_name,field)
   USE dimphy, only: klon