Changeset 3320

Timestamp:

07/24/17 11:02:35 (7 years ago)

Author:

cetlod

Message:

CM6.0.12 : remove iceberg flux from total runoffs. friver diagnostics contains only water flux from rivers

File:

• CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/file_def_nemo-opa.xml (modified) (5 diffs)

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/file_def_nemo-opa.xml

@@ -34 +34 @@
           <field field_ref="mldr10_1"     />
           <field field_ref="mldr10_1"     name="mldr10_1dcy"  long_name="amplitude of mldr10_1 diurnal cycle" operation="average" freq_op="1d" > @mldr10_1max - @mldr10_1min </field>
-          <field field_ref="mixlength"          name="mixlengthstd"   long_name="mixing_length_daily_standard_deviation"         operation="average" freq_op="1d" > sqrt( @mixlength2 - @mixlength * @mixlength ) </field>
+          <field field_ref="mixlength"    name="mixlengthstd"   long_name="mixing_length_daily_standard_deviation"         operation="average" freq_op="1d" > sqrt( @mixlength2 - @mixlength * @mixlength ) </field>
         </file>
        
@@ -112 +112 @@
           <field field_ref="emp_oce"       name="emp_oce"                      />
           <field field_ref="emp_ice"       name="emp_ice"                      />
-          <field field_ref="runoffs"       name="friver"   long_name="water_flux_into_sea_water_from_rivers"                   level="1" />
+          <field field_ref="runoffs"       name="runoffs"                      />
+      <field field_ref="runoffs"       name="friver"   long_name="water_flux_into_sea_water_from_rivers"     level="1" > runoffs - iceberg_cea </field>
           <field field_ref="calving_cea"   name="calving" />
           <field field_ref="iceberg_cea"   name="iceberg" />
@@ -155 +156 @@
           <field field_ref="empbmr"       name="wfob"     long_name="water_flux_into_sea_water at prev time-step"    />
           <field field_ref="empmr"        name="wfo"      long_name="water_flux_into_sea_water"                     />
-          <field field_ref="runoffs"      name="friver"   long_name="water_flux_into_sea_water_from_rivers"                   level="1" />
+          <field field_ref="runoffs"      name="runoffs"                      />
+          <field field_ref="runoffs"      name="friver"   long_name="water_flux_into_sea_water_from_rivers"     level="1" > runoffs - iceberg_cea </field>
           <field field_ref="fmmflx"       name="fmmflx"  />
           <field field_ref="iceconc"      name="siconc"  />
@@ -257 +259 @@
           <field field_ref="emp_oce"       name="emp_oce"                      />
           <field field_ref="emp_ice"       name="emp_ice"                      />
-          <field field_ref="runoffs"       name="friver"   long_name="water_flux_into_sea_water_from_rivers"                   level="1" />
+          <field field_ref="runoffs"       name="runoffs"                      />
+      <field field_ref="runoffs"       name="friver"   long_name="water_flux_into_sea_water_from_rivers"     level="1" > runoffs - iceberg_cea </field>
           <field field_ref="calving_cea"   name="calving" />
           <field field_ref="iceberg_cea"   name="iceberg" />
@@ -453 +456 @@
           <field field_ref="emp_oce"       name="emp_oce"                      />
           <field field_ref="emp_ice"       name="emp_ice"                      />
-          <field field_ref="runoffs"       name="friver"   long_name="water_flux_into_sea_water_from_rivers"                   level="1" />
+          <field field_ref="runoffs"       name="runoffs"                      />
+      <field field_ref="runoffs"       name="friver"   long_name="water_flux_into_sea_water_from_rivers"     level="1" > runoffs - iceberg_cea </field>
           <field field_ref="calving_cea"   name="calving" />
           <field field_ref="iceberg_cea"   name="iceberg" />