Changeset 4906 for branches/2014

Timestamp:

2014-11-27T21:01:30+01:00 (9 years ago)

Author:

cetlod

Message:

2014/dev_CNRS_2014/NEMOGCM : minor corrections

Location:

branches/2014/dev_CNRS_2014/NEMOGCM

Files:

• CONFIG/SHARED/field_def.xml (modified) (6 diffs)
• CONFIG/SHARED/namelist_ref (modified) (1 diff)
• CONFIG/cfg.txt (modified) (1 diff)
• NEMO/OPA_SRC/TRD/trdini.F90 (modified) (1 diff)
• SETTE/param.cfg (modified) (2 diffs)
• SETTE/sette.sh (modified) (2 diffs)

branches/2014/dev_CNRS_2014/NEMOGCM/CONFIG/SHARED/field_def.xml

@@ -28 +28 @@
          <field id="mldkz5"       long_name="mixing layer depth (Turbocline)"           unit="m"                        />
          <field id="mldr10_1"     long_name="Mixed Layer Depth 0.01 ref.10m"            unit="m"                        />
+         <field id="heatc"        long_name="Heat content vertically integrated"        unit="J/m2"                      />
+         <field id="saltc"        long_name="Salt content vertically integrated"        unit="PSU*kg/m2"                />
          <!-- EOS --!>
          <field id="alpha"        long_name="thermal expansion"                         unit="1/degC" grid_ref="grid_T_3D"/>
@@ -334 +336 @@
          <field id="u_masstr"     long_name="ocean eulerian mass transport along i-axis"  unit="kg/s" grid_ref="grid_U_3D" />
          <field id="u_heattr"     long_name="ocean eulerian heat transport along i-axis"  unit="W"    />
+         <field id="u_salttr"     long_name="ocean eulerian salt transport along i-axis"  unit="PSU*kg/s"    />
          <field id="ueiv_heattr"  long_name="ocean bolus heat transport along i-axis"     unit="W"    />
          <field id="udiff_heattr" long_name="ocean diffusion heat transport along i-axis" unit="W"    />
@@ -357 +360 @@
          <field id="v_masstr"     long_name="ocean eulerian mass transport along j-axis"  unit="kg/s" grid_ref="grid_V_3D" />
          <field id="v_heattr"     long_name="ocean eulerian heat transport along j-axis"  unit="W"     />
+         <field id="v_salttr"     long_name="ocean eulerian salt transport along i-axis"  unit="PSU*kg/s"    />
          <field id="veiv_heattr"  long_name="ocean bolus heat transport along j-axis"     unit="W"     />
          <field id="vdiff_heattr" long_name="ocean diffusion heat transport along j-axis" unit="W"     />
@@ -405 +409 @@
     <field id="bgsaltco"     long_name="global mean salt content"                 unit="psu*m3" />
     <field id="bgvolssh"     long_name="global mean ssh volume"                   unit="km3"     />
+         <field id="bgvole3t"     long_name="global mean volume variation (e3t)"           unit="km3"/>
     <field id="bgvoltot"     long_name="global mean volume"                       unit="km3"     />
     <field id="bgsshtot"     long_name="global mean ssh"                          unit="m"      />
@@ -415 +420 @@
 
       <field_group id="SBC_scalar"  domain_ref="1point" >
-         <!-- available with ln_limdiahsb -->
+         <!-- available with ln_limdiaout -->
     <field id="ibgvoltot"    long_name="global mean ice volume"                   unit="km3"   />
     <field id="sbgvoltot"    long_name="global mean snow volume"                  unit="km3"   />
@@ -421 +426 @@
     <field id="ibgsaline"    long_name="global mean ice salinity"                 unit="psu"   />
     <field id="ibgtemper"    long_name="global mean ice temperature"              unit="degC"   />
-    <field id="ibgheatco"    long_name="global mean ice heat content"             unit="10^9J"   />
+    <field id="ibgheatco"    long_name="global mean ice heat content"             unit="10^20J"   />
+    <field id="sbgheatco"    long_name="global mean snow heat content"            unit="10^20J"   />
     <field id="ibgsaltco"    long_name="global mean ice salt content"             unit="psu*km3"   />
-    <field id="sbgheatco"    long_name="global mean snow heat content"            unit="10^9J"   />
-    <field id="ibgfrcsfx"    long_name="global mean salt content from sfx"        unit="psu*km3"   />
-    <field id="ibgfrcemp"    long_name="global mean volume from emp"              unit="km3"      />
-    <field id="ibgsfx"       long_name="global mean emps"                         unit="psu*kg/m2/day"   />
-    <field id="ibgemp"       long_name="global mean emp"                          unit="kg/m2/day"   />
-    <field id="ibgsfxbri"    long_name="global mean ice sfx_bri"                  unit="psu*kg/m2/day"   />
-    <field id="ibgsfxthd"    long_name="global mean ice sfx_thd"                  unit="psu*kg/m2/day"   />
-    <field id="ibgsfxres"    long_name="global mean ice sfx_res"                  unit="psu*kg/m2/day"   />
-    <field id="ibgsfxmec"    long_name="global mean ice fsalt_rpo"                unit="psu*kg/m2/day"   />
-    <field id="ibggrpme"     long_name="global mean ice growth+melt volume"       unit="km3"      />
+
+    <field id="ibgvfx"       long_name="global mean volume flux (emp)"               unit="m/day"   />
+    <field id="ibgvfxbog"    long_name="global mean volume flux (bottom growth)"     unit="m/day"   />
+    <field id="ibgvfxopw"    long_name="global mean volume flux (open water growth)" unit="m/day"   />
+    <field id="ibgvfxsni"    long_name="global mean volume flux (snow-ice growth)"   unit="m/day"   />
+    <field id="ibgvfxdyn"    long_name="global mean volume flux (dynamic growth)"    unit="m/day"   />
+    <field id="ibgvfxbom"    long_name="global mean volume flux (bottom melt)"       unit="m/day"   />
+    <field id="ibgvfxsum"    long_name="global mean volume flux (surface melt)"      unit="m/day"   />
+    <field id="ibgvfxres"    long_name="global mean volume flux (resultant)"         unit="m/day"   />
+    <field id="ibgvfxspr"    long_name="global mean volume flux (snow precip)"       unit="m/day"   />
+    <field id="ibgvfxsnw"    long_name="global mean volume flux (snow melt)"         unit="m/day"   />
+    <field id="ibgvfxsub"    long_name="global mean volume flux (snow sublimation)"  unit="m/day"   />
+
+    <field id="ibgsfx"       long_name="global mean salt flux (total)"            unit="psu*m/day"   />
+    <field id="ibgsfxbri"    long_name="global mean salt flux (brines)"           unit="psu*m/day"   />
+    <field id="ibgsfxdyn"    long_name="global mean salt flux (dynamic)"          unit="psu*m/day"   />
+    <field id="ibgsfxres"    long_name="global mean salt flux (resultant)"        unit="psu*m/day"   />
+    <field id="ibgsfxbog"    long_name="global mean salt flux (thermo)"           unit="psu*m/day"   />
+    <field id="ibgsfxopw"    long_name="global mean salt flux (thermo)"           unit="psu*m/day"   />
+    <field id="ibgsfxsni"    long_name="global mean salt flux (thermo)"           unit="psu*m/day"   />
+    <field id="ibgsfxbom"    long_name="global mean salt flux (thermo)"           unit="psu*m/day"   />
+    <field id="ibgsfxsum"    long_name="global mean salt flux (thermo)"           unit="psu*m/day"   />
+
+
+        <field id="ibghfxdhc"    long_name="Heat content variation in snow and ice"   unit="W" />
+        <field id="ibghfxspr"    long_name="Heat content of snow precip"              unit="W" />
+
+        <field id="ibghfxthd"   long_name="heat fluxes from ice-ocean exchange during thermo"              unit="W"  />
+        <field id="ibghfxsum"   long_name="heat fluxes causing surface ice melt"              unit="W"  />
+        <field id="ibghfxbom"   long_name="heat fluxes causing bottom ice melt"              unit="W"  />
+        <field id="ibghfxbog"   long_name="heat fluxes causing bottom ice growth"              unit="W"  />
+        <field id="ibghfxdif"   long_name="heat fluxes causing ice temperature change"              unit="W"  />
+        <field id="ibghfxopw"   long_name="heat fluxes causing open water ice formation"              unit="W"  />
+        <field id="ibghfxdyn"   long_name="heat fluxes from ice-ocean exchange during dynamic"             unit="W"  />
+        <field id="ibghfxres"   long_name="heat fluxes from ice-ocean exchange during resultant"           unit="W"  />
+        <field id="ibghfxsub"   long_name="heat fluxes from sublimation"                                   unit="W"  />
+        <field id="ibghfxsnw"   long_name="heat fluxes from snow-ocean exchange"                           unit="W"  />
+        <field id="ibghfxout"   long_name="non solar heat fluxes received by the ocean"                    unit="W"  />
+        <field id="ibghfxin"    long_name="total heat fluxes at the ice surface"                           unit="W"  />
+
+    <field id="ibgfrcvol"    long_name="global mean forcing volume (emp)"         unit="km3"      />
+    <field id="ibgfrcsfx"    long_name="global mean forcing salt   (sfx)"         unit="psu*km3"   />
+    <field id="ibgvolgrm"    long_name="global mean ice growth+melt volume"       unit="km3"      />
       </field_group>
   

branches/2014/dev_CNRS_2014/NEMOGCM/CONFIG/SHARED/namelist_ref

@@ -1050 +1050 @@
    ln_KE_trd   = .false.   ! (T) 3D Kinetic   Energy     trends
    ln_PE_trd   = .false.   ! (T) 3D Potential Energy     trends
-   ln_tra_trd  = .true.    ! (T) 3D tracer trend output
+   ln_tra_trd  = .FALSE.   ! (T) 3D tracer trend output
    ln_tra_mxl  = .false.   ! (T) 2D tracer trends averaged over the mixed layer (not coded yet)
    nn_trd      = 365       !  print frequency (ln_glo_trd=T) (unit=time step)

branches/2014/dev_CNRS_2014/NEMOGCM/CONFIG/cfg.txt

@@ -2 +2 @@
 ORCA2_LIM_CFC_C14b OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC
 GYRE_XIOS OPA_SRC
-ORCA2_OFF_PISCES OPA_SRC OFF_SRC TOP_SRC
 ORCA2_SAS_LIM OPA_SRC SAS_SRC LIM_SRC_2 NST_SRC
 C1D_PAPA OPA_SRC
 ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC
+GYRE_BFM OPA_SRC TOP_SRC
 AMM12 OPA_SRC
-GYRE_BFM OPA_SRC TOP_SRC
+ORCA2_LIM3 OPA_SRC LIM_SRC_3 NST_SRC
+ORCA2_OFF_PISCES OPA_SRC OFF_SRC TOP_SRC
 ORCA2_LIM_PISCES OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC
 GYRE OPA_SRC
-ORCA2_LIM3 OPA_SRC LIM_SRC_3 NST_SRC

branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/OPA_SRC/TRD/trdini.F90

@@ -91 +91 @@
 !!gm end
       !
-      IF( lk_vvl )   CALL ctl_stop( 'trend diagnostics with variable volume not validated' )
+      IF( lk_vvl .AND. ( l_trdtra .OR. l_trddyn ) )  CALL ctl_stop( 'trend diagnostics with variable volume not validated' )
       
 !!gm  : Potential BUG : 3D output only for vector invariant form!  add a ctl_stop or code the flux form case

branches/2014/dev_CNRS_2014/NEMOGCM/SETTE/param.cfg

@@ -1 +1 @@
 #- forcing files storing 
-FORCING_DIR=~/FORCING
+FORCING_DIR=${WORKDIR}/FORCING
 #- input files storing 
 INPUT_DIR=${CONFIG_DIR}/${NEW_CONF}/EXP00
@@ -6 +6 @@
 #TMPDIR=${CONFIG_DIR}/${NEW_CONF}/EXP00
 #- VALIDATION files storing 
-NEMO_VALIDATION_DIR=~/NEMO_VALIDATION
+NEMO_VALIDATION_DIR=${WORKDIR}/NEMO_VALIDATION

branches/2014/dev_CNRS_2014/NEMOGCM/SETTE/sette.sh

@@ -88 +88 @@
 #
 # Compiler among those in NEMOGCM/ARCH
-COMPILER=tobedefined
+COMPILER=x3750_ADA
 export BATCH_COMMAND_PAR="llsubmit"
 export BATCH_COMMAND_SEQ=$BATCH_COMMAND_PAR
-export INTERACT_FLAG="yes"
+export INTERACT_FLAG="no"
 export MPIRUN_FLAG="yes"
 export USING_XIOS="yes"
@@ -140 +140 @@
 # SAS             :11 & 12
 # ORCA2_AGRIF_LIM :13
-for config in 1 2 3 4 5 6 7 8 9 10 11 12 13
+##for config in 1 2 3 4 5 6 7 8 9 10 11 12 13
+##for config in 1 2 3 4 5 6 7 8 9 10
+for config in 9 10
 
 do