Changeset 2669 for LMDZ5/branches/testing/DefLists

Timestamp:

Oct 14, 2016, 2:57:28 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2640:2664 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• DefLists/README (copied) (copied from LMDZ5/trunk/DefLists/README)
• DefLists/context_lmdz.xml (modified) (1 diff)
• DefLists/field_def_lmdz.xml (modified) (1 diff)
• DefLists/file_def_histmth_lmdz.xml (modified) (1 diff)
• DefLists/gcm.def_144x142 (modified) (4 diffs)
• DefLists/iodef_dev.xml (modified) (8 diffs)
• DefLists/physiq.def_L79_NPv5.4 (deleted)
• DefLists/physiq.def_L79_NPv5.5 (deleted)
• DefLists/physiq.def_NPv5.65 (modified) (1 diff)
• DefLists/physiq.def_NPv5.67 (modified) (1 diff)
• DefLists/physiq.def_NPv5.70 (copied) (copied from LMDZ5/trunk/DefLists/physiq.def_NPv5.70)

LMDZ5/branches/testing/DefLists/context_lmdz.xml

@@ -31 +31 @@
     <grid_group id="vertical" axis_ref="presnivs" />
   </grid_> -->
-  
+
+<!-- Define Scalar grid for GHG, orbital parameters and solar constants -->
+  <grid_definition>
+    <grid id="grid_scalar" />
+    </grid_definition>
+ 
   <!-- Define groups of vertical axes -->
   <axis_definition>

LMDZ5/branches/testing/DefLists/field_def_lmdz.xml

@@ -867 +867 @@
     </field_group>
 
+
+   <field_group id="field_scalar" operation="instant" freq_op="30d" grid_ref="grid_scalar">
+      <field id="R_ecc" long_name="R_ecc" unit="-" />
+      <field id="R_peri" long_name="R_peri" unit="-" />
+      <field id="R_incl" long_name="R_incl" unit="deg" />
+      <field id="solaire" long_name="solaire" unit="W/m2" />
+
+      <field id="rsun1" long_name="Fraction constante solaire bande 1" unit="W/m2" />
+      <field id="rsun2" long_name="Fraction constante solaire bande 2" unit="W/m2" />
+      <field id="rsun3" long_name="Fraction constante solaire bande 3" unit="W/m2" />
+      <field id="rsun4" long_name="Fraction constante solaire bande 4" unit="W/m2" />
+      <field id="rsun5" long_name="Fraction constante solaire bande 5" unit="W/m2" />
+      <field id="rsun6" long_name="Fraction constante solaire bande 6" unit="W/m2" />
+
+      <field id="co2_ppm" long_name="co2_ppm" unit="ppm" />
+      <field id="CH4_ppb" long_name="CH4_ppb" unit="ppb" />
+      <field id="N2O_ppb" long_name="N2O_ppb" unit="ppb" />
+      <field id="CFC11_ppt" long_name="CFC11_ppt" unit="ppt" />
+      <field id="CFC12_ppt" long_name="CFC12_ppt" unit="ppt" />
+   </field_group>
+
 </field_definition>
-

LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml

@@ -10 +10 @@
 <!--            </field_group>  -->
         
+
+            <field_group operation="instant" freq_op="30d">
+                <field field_ref="R_ecc" level="1" name="R_ecc" />
+                <field field_ref="R_peri" level="1" name="R_peri" />
+                <field field_ref="R_incl" level="1" name="R_incl" />
+                <field field_ref="solaire" level="1" name="solaire" />
+
+                <field field_ref="rsun1" level="1" name="rsun1" />
+                <field field_ref="rsun2" level="1" name="rsun2" />
+                <field field_ref="rsun3" level="1" name="rsun3" />
+                <field field_ref="rsun4" level="1" name="rsun4" />
+                <field field_ref="rsun5" level="1" name="rsun5" />
+                <field field_ref="rsun6" level="1" name="rsun6" />
+
+                <field field_ref="co2_ppm" level="1" name="co2_ppm" />
+                <field field_ref="CH4_ppb" level="1" name="CH4_ppb" />
+                <field field_ref="N2O_ppb" level="1" name="N2O_ppb" />
+                <field field_ref="CFC11_ppt" level="1" name="CFC11_ppt" />
+                <field field_ref="CFC12_ppt" level="1" name="CFC12_ppt" />
+
+            </field_group>
+
             <!-- VARS 2D -->
             <field_group operation="average" freq_op="1ts">

LMDZ5/branches/testing/DefLists/gcm.def_144x142

@@ -1 @@
-## $Id: gcm.def 1403 2010-07-01 09:02:53Z fairhead $
+## $Id$
 ## nombre de pas par jour (multiple de iperiod) ( ici pour  dt = 1 min )      
-day_step=960
+day_step=720
 ## periode pour le pas Matsuno (en pas)
 iperiod=5
@@ -13 +13 @@
 niterh=2
 ## temps de dissipation des plus petites long.d ondes pour u,v (gradiv)  
-tetagdiv=1800.
+tetagdiv=3600.
 ## temps de dissipation des plus petites long.d ondes pour u,v(nxgradrot)
-#tetagrot=5400.
 tetagrot=7200.
 ## temps de dissipation des plus petites long.d ondes pour  h ( divgrad) 
-tetatemp=5400.
+tetatemp=7200.
 ## coefficient pour gamdissip                                            
 coefdis=0.
@@ -33 +32 @@
 read_start=y
 ## periode de la physique (en pas dynamiques, n'a de sens que si iflag_phys=1)                                       
+## iphysiq est modifie pour la nouvelle physique par le lmdz.driver pour les autres cas le valeur par defaut est utilise
 iphysiq=_AUTO_ : DEFAULT = 5
-#
-#
-### Parametres du zoom
 ## longitude en degres du centre du zoom                                 
 clon=0.
@@ -57 +54 @@
 ##  Fonction  f(y) avec y = Sin(latit.) si = .true. , sinon y = latit.         
 ysinus=y
+##
+ngroup=4

LMDZ5/branches/testing/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/branches/testing/DefLists/physiq.def_NPv5.65

@@ -36 +36 @@
 gwd_rando_sat=0.2
 
-ok_strato=y
-ok_hines=n
 sso_gkdrag=0.2
 sso_gfrcri=0.70

LMDZ5/branches/testing/DefLists/physiq.def_NPv5.67

@@ -36 +36 @@
 gwd_rando_sat=0.2
 
-ok_strato=y
-ok_hines=n
 sso_gkdrag=0.2
 sso_gfrcri=0.70