Changeset 5137 for branches/2015/dev_r5020_CNRS_DIAPTR/NEMOGCM/CONFIG

Timestamp:

2015-03-11T10:57:11+01:00 (9 years ago)

Author:

cetlod

Message:

dev_r5020_CNRS_DIAPTR: some improvments of poleward heat transport diagnostics before merging with the trunk

Location:

branches/2015/dev_r5020_CNRS_DIAPTR/NEMOGCM/CONFIG

Files:

• ORCA2_LIM/EXP00/iodef.xml (modified) (4 diffs)
• ORCA2_LIM/cpp_ORCA2_LIM.fcm (modified) (1 diff)
• SHARED/namelist_ref (modified) (2 diffs)
• cfg.txt (modified) (1 diff)

branches/2015/dev_r5020_CNRS_DIAPTR/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml

@@ -21 +21 @@
     -->
     
-    <file_definition type="multiple_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="10d" min_digits="4">
+    <file_definition type="one_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="10d" min_digits="4">
     
       <file_group id="1ts" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
@@ -54 +54 @@
 
    <file id="file3" name_suffix="_grid_U" description="ocean U grid variables" >
-     <field field_ref="suoce"        name="uos"     long_name="sea_surface_x_velocity"    />
      <field field_ref="uoce"         name="uo"      long_name="sea_water_x_velocity"      />
      <field field_ref="utau"         name="tauuo"   long_name="surface_downward_x_stress" />
@@ -63 +62 @@
    
    <file id="file4" name_suffix="_grid_V" description="ocean V grid variables" >
-     <field field_ref="svoce"        name="vos"     long_name="sea_surface_y_velocity"    />
      <field field_ref="voce"         name="vo"      long_name="sea_water_y_velocity"      />
      <field field_ref="vtau"         name="tauvo"   long_name="surface_downward_y_stress" />
@@ -91 +89 @@
    </file>
 
+       <file id="file7" name_suffix="_diaptr" description="diaptr variables" >
+           <field field_ref="zomsfglo"    />
+           <field field_ref="zomsfatl"    />
+           <field field_ref="zomsfpac"    />
+           <field field_ref="zomsfind"    />
+           <field field_ref="zomsfipc"     />
+           <field field_ref="zotemglo"   />
+           <field field_ref="zotematl"   />
+           <field field_ref="zotempac"   />
+           <field field_ref="zotemind"   />
+           <field field_ref="zotemipc"   />
+           <field field_ref="zosalglo"     />
+           <field field_ref="zosalatl"     />
+           <field field_ref="zosalpac"     />
+           <field field_ref="zosalind"     />
+           <field field_ref="zosalipc"     />
+           <field field_ref="zosrfglo"    />
+           <field field_ref="zosrfatl"    />
+           <field field_ref="zosrfpac"    />
+           <field field_ref="zosrfind"    />
+           <field field_ref="zosrfipc"    />
+           <field field_ref="sophtadv"      />
+           <field field_ref="sophtldf"      />
+           <field field_ref="sopstadv"      />
+           <field field_ref="sopstldf"      />
+        </file>
    <!--
    <file id="file8" name_suffix="_Tides" description="tidal harmonics" >

branches/2015/dev_r5020_CNRS_DIAPTR/NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm

@@ -1 @@
-bld::tool::fppkeys key_trabbl key_lim2 key_dynspg_flt key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi key_diaobs key_asminc
+bld::tool::fppkeys key_trabbl key_lim2 key_dynspg_flt key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi

branches/2015/dev_r5020_CNRS_DIAPTR/NEMOGCM/CONFIG/SHARED/namelist_ref

@@ -1071 +1071 @@
 !!   namnc4       netcdf4 chunking and compression settings             ("key_netcdf4")
 !!   namtrd       dynamics and/or tracer trends
+!!   namptr       Poleward Transport Diagnostics
 !!   namflo       float parameters                                      ("key_float")
 !!   namhsb       Heat and salt budgets
@@ -1120 +1121 @@
    ln_ariane     = .true.     !  Input with Ariane tool convention(T)
    ln_flo_ascii  = .true.     !  Output with Ariane tool netcdf convention(F) or ascii file (T)
+/
+!-----------------------------------------------------------------------
+&namptr       !   Poleward Transport Diagnostic
+!-----------------------------------------------------------------------
+   ln_diaptr  = .false.    !  Poleward heat and salt transport (T) or not (F)
+   ln_subbas  = .false.     !  Atlantic/Pacific/Indian basins computation (T) or not
 /
 !-----------------------------------------------------------------------

branches/2015/dev_r5020_CNRS_DIAPTR/NEMOGCM/CONFIG/cfg.txt

@@ -11 +11 @@
 GYRE OPA_SRC
 ORCA2_LIM3 OPA_SRC LIM_SRC_3 NST_SRC
+ORCA2_LIM_PTR OPA_SRC LIM_SRC_2 NST_SRC
 ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC
-ORCA2_LIM_PTR OPA_SRC LIM_SRC_2 NST_SRC