Changeset 10261

Timestamp:

2018-10-31T16:30:10+01:00 (6 years ago)

Author:

dford

Message:

Ensure BGC diagnostics are properly land-masked.

Location:

branches/UKMO/AMM15_v3_6_STABLE_package_bgc_updates/NEMOGCM/NEMO/TOP_SRC/FABM

Files:

• trcini_fabm.F90 (modified) (3 diffs)
• trcwri_fabm.F90 (modified) (2 diffs)

branches/UKMO/AMM15_v3_6_STABLE_package_bgc_updates/NEMOGCM/NEMO/TOP_SRC/FABM/trcini_fabm.F90

@@ -151 +151 @@
             CALL write_25hourm_xml(xml_unit,model%horizontal_diagnostic_variables(jn))
          END DO
-         WRITE (xml_unit,'(A)') '  <field id="visib" long_name="visibility" unit="m" default_value="-.200E+21" grid_ref="grid_T_3D" />'
-         WRITE (xml_unit,'(A)') '  <field id="visib25h" long_name="visibility 25-hour mean" unit="m" default_value="-.200E+21" grid_ref="grid_T_3D" />'
-         WRITE (xml_unit,'(A)') '  <field id="top_visib" long_name="Top-level visibility" unit="m" default_value="-.200E+21" grid_ref="grid_T_2D" />'
-         WRITE (xml_unit,'(A)') '  <field id="mid_visib" long_name="Middle-level visibility" unit="m" default_value="-.200E+21" grid_ref="grid_T_2D" />'
-         WRITE (xml_unit,'(A)') '  <field id="bot_visib" long_name="Bottom-level visibility" unit="m" default_value="-.200E+21" grid_ref="grid_T_2D" />'
+         WRITE (xml_unit,'(A)') '  <field id="visib" long_name="visibility" unit="m" default_value="1.e+20" grid_ref="grid_T_3D" />'
+         WRITE (xml_unit,'(A)') '  <field id="visib25h" long_name="visibility 25-hour mean" unit="m" default_value="1.e+20" grid_ref="grid_T_3D" />'
+         WRITE (xml_unit,'(A)') '  <field id="top_visib" long_name="Top-level visibility" unit="m" default_value="1.e+20" grid_ref="grid_T_2D" />'
+         WRITE (xml_unit,'(A)') '  <field id="mid_visib" long_name="Middle-level visibility" unit="m" default_value="1.e+20" grid_ref="grid_T_2D" />'
+         WRITE (xml_unit,'(A)') '  <field id="bot_visib" long_name="Bottom-level visibility" unit="m" default_value="1.e+20" grid_ref="grid_T_2D" />'
          WRITE (xml_unit,1000) ' </field_group>'
 
@@ -238 +238 @@
       ENDIF
 
-      WRITE (missing_value,'(E9.3)') variable%missing_value
+      WRITE (missing_value,'(E9.3)') 1.e+20
       WRITE (string_dimensions,'(I1)') number_dimensions
       SELECT CASE (number_dimensions)
@@ -261 +261 @@
       CHARACTER(LEN=20) :: missing_value
 
-      WRITE (missing_value,'(E9.3)') variable%missing_value
+      WRITE (missing_value,'(E9.3)') 1.e+20
       WRITE (xml_unit,'(A)') '  <field id="top_'//TRIM(variable%name)//'" long_name="Top-level '//TRIM(variable%long_name)//'" unit="'//TRIM(variable%units)//'" default_value="'//TRIM(ADJUSTL(missing_value))//'" grid_ref="grid_T_2D"/>'
       WRITE (xml_unit,'(A)') '  <field id="mid_'//TRIM(variable%name)//'" long_name="Middle-level '//TRIM(variable%long_name)//'" unit="'//TRIM(variable%units)//'" default_value="'//TRIM(ADJUSTL(missing_value))//'" grid_ref="grid_T_2D"/>'

branches/UKMO/AMM15_v3_6_STABLE_package_bgc_updates/NEMOGCM/NEMO/TOP_SRC/FABM/trcwri_fabm.F90

@@ -81 +81 @@
       INTEGER, INTENT( in )               :: kt
       INTEGER              :: jn
+      
+      REAL(wp), DIMENSION(jpi,jpj,jpk)    :: zw3d
 
 #if defined key_tracer_budget
@@ -105 +107 @@
              CALL iom_put( model%diagnostic_variables(jn)%name, fabm_get_bulk_diagnostic_data(model,jn))
       END DO
-      CALL iom_put( 'visib', visib(:,:,:) )
+      zw3d(:,:,:) = visib(:,:,:)*tmask(:,:,:) + 1.e+20*(1.0-tmask(:,:,:))
+      CALL iom_put( 'visib', zw3d )
 
       ! write 2D diagnostics in the file