Changeset 2276

Timestamp:

May 13, 2015, 6:25:50 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Backport of trunk revision 2268 into LMDZ6_rc0 branch:

• modifications for COSP/XIOS

Location:

LMDZ5/branches/LMDZ6_rc0

Files:

• DefLists/field_def_lmdz.xml (modified) (4 diffs)
• DefLists/file_def_histdayCOSP_lmdz.xml (modified) (2 diffs)
• DefLists/file_def_histhfCOSP_lmdz.xml (modified) (2 diffs)
• DefLists/file_def_histmthCOSP_lmdz.xml (modified) (2 diffs)
• libf/cosp/cosp_output_mod.F90 (modified) (2 diffs)
• libf/cosp/cosp_output_write_mod.F90 (modified) (2 diffs)

LMDZ5/branches/LMDZ6_rc0/DefLists/field_def_lmdz.xml

@@ -1 @@
-<field_definition level="1" prec="4" operation="average" freq_op="1ts" enabled=".true.">
+<field_definition level="1" prec="4" operation="average" freq_op="1ts" enabled=".true." default_value="9.96921e+36">
     
 <!--    <field_group id="fields_1D" grid_ref="vertical">  -->
@@ -598 +598 @@
     </field_group>
 
-    <field_group id="fields_COSP_CALIPSO" domain_ref="dom_glo">
+    <field_group id="fields_COSP_CALIPSO" domain_ref="dom_glo" freq_op="3h">
       <field id="cllcalipso"    long_name="Lidar Low-level Cloud Fraction"   unit="1" />
       <field id="clhcalipso"    long_name="Lidar Hight-level Cloud Fraction"   unit="1" />
@@ -606 +606 @@
       <field id="parasol_refl"  long_name="PARASOL-like mono-directional reflectance" unit="1" axis_ref="sza" />
       <field id="parasol_crefl"  long_name="PARASOL-like mono-directional reflectance (integral)" unit="1" axis_ref="sza" />
+      <field id="Ncrefl"  long_name="Nb for PARASOL-like mono-directional reflectance" unit="1" axis_ref="sza" />
       <field id="c01_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
       <field id="c02_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
@@ -649 +650 @@
     </field_group>  
 
-    <field_group id="fields_COSP_ISCCP" domain_ref="dom_glo">
+    <field_group id="fields_COSP_ISCCP" domain_ref="dom_glo" freq_op="3h">
       <field id="sunlit" long_name="1 for day points, 0 for nightime" unit="1" />
       <field id="c01_clisccp2" long_name="Cloud Fraction as Calculated by the ISCCP Simulator" unit="1" axis_ref="pressure2" />

LMDZ5/branches/LMDZ6_rc0/DefLists/file_def_histdayCOSP_lmdz.xml

@@ -4 +4 @@
 
             <!-- VARS 2D -->
-            <field_group operation="instant" freq_op="1ts">
+            <field_group operation="average" freq_op="3h">
                 <field field_ref="cllcalipso"         level="1" />
                 <field field_ref="clmcalipso"         level="1" />
@@ -12 +12 @@
                 <field field_ref="parasol_refl"  level="1" axis_ref="sza" />
                 <field field_ref="parasol_crefl"  level="1" axis_ref="sza" />
+                <field field_ref="Ncrefl"  level="1" axis_ref="sza" />
                 <field field_ref="c01_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
                 <field field_ref="c02_cfad_lidarsr532"  level="10" axis_ref="presnivs" />

LMDZ5/branches/LMDZ6_rc0/DefLists/file_def_histhfCOSP_lmdz.xml

@@ -1 +1 @@
 <file_definition>
      <file_group id="defile">
-        <file id="histhfCOSP" name="XhisthfCOSP" output_freq="6h" output_level="10"  enabled=".FALSE.">
+        <file id="histhfCOSP" name="XhisthfCOSP" output_freq="3h" output_level="10"  enabled=".FALSE.">
 
             <!-- VARS 2D -->
-            <field_group operation="instant" freq_op="1ts">
+            <field_group operation="instant" freq_op="3h">
                 <field field_ref="cllcalipso"         level="1" />
                 <field field_ref="clmcalipso"         level="1" />
@@ -12 +12 @@
                 <field field_ref="parasol_refl"  level="1" axis_ref="sza" />
                 <field field_ref="parasol_crefl"  level="1" axis_ref="sza" />
+                <field field_ref="Ncrefl"  level="1" axis_ref="sza" />
                 <field field_ref="c01_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
                 <field field_ref="c02_cfad_lidarsr532"  level="10" axis_ref="presnivs" />

LMDZ5/branches/LMDZ6_rc0/DefLists/file_def_histmthCOSP_lmdz.xml

@@ -1 +1 @@
 <file_definition>
      <file_group id="defile">
-        <file id="histmthCOSP" name="XhistmthCOSP" output_freq="5d" output_level="10"  enabled=".FALSE.">
+        <file id="histmthCOSP" name="XhistmthCOSP" output_freq="1mo" output_level="10"  enabled=".FALSE.">
 
             <!-- VARS 2D -->
-            <field_group operation="instant" freq_op="1ts">
+            <field_group operation="average" freq_op="3h">
                 <field field_ref="cllcalipso"         level="1" />
                 <field field_ref="clmcalipso"         level="1" />
@@ -12 +12 @@
                 <field field_ref="parasol_refl"  level="1" axis_ref="sza" />
                 <field field_ref="parasol_crefl"  level="1" axis_ref="sza" />
+                <field field_ref="Ncrefl"  level="1" axis_ref="sza" />
                 <field field_ref="c01_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
                 <field field_ref="c02_cfad_lidarsr532"  level="10" axis_ref="presnivs" />

LMDZ5/branches/LMDZ6_rc0/libf/cosp/cosp_output_mod.F90

@@ -50 +50 @@
   TYPE(ctrl_outcosp), SAVE :: o_parasol_crefl = ctrl_outcosp((/ .TRUE., .TRUE., .TRUE. /), &              
          "parasol_crefl", "PARASOL-like mono-directional reflectance (integral)","1", (/ ('', i=1, 3) /))                  
+  TYPE(ctrl_outcosp), SAVE :: o_Ncrefl = ctrl_outcosp((/ .TRUE., .TRUE., .TRUE. /), &
+         "Ncrefl", "Nb PARASOL-like mono-directional reflectance (integral)","1", (/ ('', i=1, 3) /))
   TYPE(ctrl_outcosp), SAVE :: o_atb532 = ctrl_outcosp((/ .FALSE., .FALSE., .FALSE. /), &
          "atb532", "Lidar Attenuated Total Backscatter (532 nm)","1", (/ ('', i=1, 3) /))
@@ -172 +174 @@
     ! ug R\'eglage du calendrier xios
     !Temps julian => an, mois, jour, heure
-    CALL ju2ymds(zjulian, x_an, x_mois, x_jour, x_heure)
-    CALL ju2ymds(zjulian_start, ini_an, ini_mois, ini_jour, ini_heure)
-    CALL wxios_set_cal(dtime, calend, x_an, x_mois, x_jour, x_heure, ini_an, &
-                       ini_mois, ini_jour, ini_heure )
+!    CALL ju2ymds(zjulian, x_an, x_mois, x_jour, x_heure)
+!    CALL ju2ymds(zjulian_start, ini_an, ini_mois, ini_jour, ini_heure)
+!    CALL wxios_set_cal(dtime, calend, x_an, x_mois, x_jour, x_heure, ini_an, &
+!                       ini_mois, ini_jour, ini_heure )
        ! ug d�claration des axes verticaux de chaque fichier:
-    if (use_vgrid) then
+!    if (use_vgrid) then
         CALL wxios_add_vaxis("height", vgrid%Nlvgrid, vgrid%z)
-    else
-         WRITE(lunout,*) 'wxios_add_vaxis "presnivs", vgrid%Nlvgrid ',vgrid%Nlvgrid
-        CALL wxios_add_vaxis("presnivs", vgrid%Nlvgrid, presnivs)
-    endif
+!    else
+!         WRITE(lunout,*) 'wxios_add_vaxis "presnivs", vgrid%Nlvgrid ',vgrid%Nlvgrid
+!        CALL wxios_add_vaxis("presnivs", vgrid%Nlvgrid, presnivs)
+!    endif
     WRITE(lunout,*) 'wxios_add_vaxis height_mlev, Nlevlmdz ',Nlevlmdz
     CALL wxios_add_vaxis("height_mlev", Nlevlmdz, vgrid%mz)

LMDZ5/branches/LMDZ6_rc0/libf/cosp/cosp_output_write_mod.F90

@@ -73 +73 @@
    endif
 
-#ifdef CPP_XIOS
- !$OMP MASTER
-IF (cosp_varsdefined) THEN
-   if (prt_level >= 10) then
-         WRITE(lunout,*)'Apell xios_update_calendar cosp_varsdefined iinitend ', &
-                         cosp_varsdefined,iinitend
-   endif 
-    CALL xios_update_calendar(itau_wcosp)
-ENDIF
-  !$OMP END MASTER
-  !$OMP BARRIER
-#endif
+!#ifdef CPP_XIOS
+! !$OMP MASTER
+!IF (cosp_varsdefined) THEN
+!   if (prt_level >= 10) then
+!         WRITE(lunout,*)'Apell xios_update_calendar cosp_varsdefined iinitend ', &
+!                         cosp_varsdefined,iinitend
+!   endif 
+!    CALL xios_update_calendar(itau_wcosp)
+!ENDIF
+!  !$OMP END MASTER
+!  !$OMP BARRIER
+!#endif
 
  if (cfg%Llidar_sim) then
@@ -153 +153 @@
     enddo
    enddo
+   CALL histwrite3d_cosp(o_Ncrefl,Ncref,nvertp)
    CALL histwrite3d_cosp(o_parasol_crefl,parasolcrefl,nvertp)