Changeset 15695

Timestamp:

2022-02-04T17:43:35+01:00 (2 years ago)

Author:

davestorkey

Message:

Fix duplicate iom_put calls for rhop.

Location:

NEMO/branches/UKMO/NEMO_4.0.3_GO8_package

Files:

• cfgs/SHARED/field_def_nemo-oce.xml (modified) (2 diffs)
• src/OCE/DIA/diaprod.F90 (modified) (1 diff)

NEMO/branches/UKMO/NEMO_4.0.3_GO8_package/cfgs/SHARED/field_def_nemo-oce.xml

@@ -99 +99 @@
          <!-- Case EOS = TEOS-10 : output potential temperature -->
    <field id="toce_pot"     long_name="Sea Water Potential Temperature"              standard_name="sea_water_potential_temperature"   unit="degC"     grid_ref="grid_T_3D"/>
-        <field id="sst_pot"      long_name="potential sea surface temperature"             standard_name="sea_surface_temperature"             unit="degC"     />
+        <field id="sst_pot"      long_name="potential sea surface temperature"            standard_name="sea_surface_temperature"             unit="degC"     />
         <field id="tosmint_pot"  long_name="vertical integral of potential temperature times density"   standard_name="integral_wrt_depth_of_product_of_density_and_potential_temperature"  unit="(kg m2) degree_C" />
 
@@ -129 +129 @@
         <field id="beta"         long_name="haline contraction"                                                        unit="1e3"    grid_ref="grid_T_3D" />
         <field id="rhop"         long_name="potential density (sigma0)"        standard_name="sea_water_sigma_theta"   unit="kg/m3"  grid_ref="grid_T_3D" />
+        <field id="rhop_e3t"     long_name="potential density (sigma0) thickness weighted"        standard_name="sea_water_sigma_theta"   unit="kg/m3"  grid_ref="grid_T_3D"> rhop * e3t </field>
 
         <!-- Energy - horizontal divergence -->

NEMO/branches/UKMO/NEMO_4.0.3_GO8_package/src/OCE/DIA/diaprod.F90

@@ -65 +65 @@
       !
 
-      IF( iom_use("urhop") .OR. iom_use("vrhop") .OR. iom_use("wrhop") &
-#if ! defined key_diaar5
-     &  .OR. iom_use("rhop") &
-#endif
-     & ) THEN
+      IF( iom_use("urhop") .OR. iom_use("vrhop") .OR. iom_use("wrhop") ) THEN
          CALL eos( tsn, z3d, zrhop )                 ! now in situ and potential density
          zrhop(:,:,:) = zrhop(:,:,:)-1000.e0         ! reference potential density to 1000 to avoid precision issues in rhop2 calculation
          zrhop(:,:,jpk) = 0._wp
-#if ! defined key_diaar5
-         CALL iom_put( 'rhop', zrhop )
-#else
-         ! If key_diaar5 set then there is already an iom_put call to output rhop.
-         ! Really should be a standard diagnostics option?
-#endif
       ENDIF