Changeset 7011

Timestamp:

2016-10-07T16:40:30+02:00 (8 years ago)

Author:

timgraham

Message:

Bug fix: missing IF(ln_diaptr) statements and forgotten field_def line

Location:

branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM

Files:

• CONFIG/SHARED/field_def.xml (modified) (1 diff)
• NEMO/OPA_SRC/DIA/diaprod.F90 (modified) (2 diffs)

branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/CONFIG/SHARED/field_def.xml

@@ -233 +233 @@
          <field id="fsal_real_cea" long_name="Real salt flux due to ice formation (cell average)"       standard_name="downward_sea_ice_basal_salt_flux"                                              unit="kg/m2/s"  />
          <field id="hflx_rain_cea" long_name="heat flux due to rainfall"                                standard_name="temperature_flux_due_to_rainfall_expressed_as_heat_flux_into_sea_water"        unit="W/m2"     />
+         <field id="hflx_prec_cea" long_name="heat flux due to precipitation"                           standard_name="temperature_flux_due_to_precipitation_expressed_as_heat_flux_into_sea_water"        unit="W/m2"     />
          <field id="hflx_evap_cea" long_name="heat flux due to evaporation"                             standard_name="temperature_flux_due_to_evaporation_expressed_as_heat_flux_out_of_sea_water"   unit="W/m2"     />
          <field id="hflx_snow_cea" long_name="heat flux due to snow falling over ice-free ocean"        standard_name="heat_flux_into_sea_water_due_to_snow_thermodynamics"                           unit="W/m2"     />

branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/NEMO/OPA_SRC/DIA/diaprod.F90

@@ -116 +116 @@
             END DO
          END DO
-         CALL dia_ptr_ohst_components( jp_tem, 'vts', z3d)
+         IF(ln_diaptr) CALL dia_ptr_ohst_components( jp_tem, 'vts', z3d)
       ENDIF
 
@@ -165 +165 @@
             END DO
          END DO
-         CALL dia_ptr_ohst_components( jp_sal, 'vts', z3d)
+         IF(ln_diaptr) CALL dia_ptr_ohst_components( jp_sal, 'vts', z3d)
       ENDIF