Changeset 10366 for branches/UKMO/AMM15_v3_6_STABLE_package_collate_bgc_diagnostics/NEMOGCM/NEMO/TOP_SRC/FABM

Timestamp:

2018-12-03T12:26:33+01:00 (5 years ago)

Author:

dford

Message:

Remove visibility, as now available through FABM, and switch from deprecated get_bulk to get_interior.

Location:

branches/UKMO/AMM15_v3_6_STABLE_package_collate_bgc_diagnostics/NEMOGCM/NEMO/TOP_SRC/FABM

Files:

• par_fabm.F90 (modified) (1 diff)
• trcini_fabm.F90 (modified) (4 diffs)
• trcsms_fabm.F90 (modified) (2 diffs)
• trcwri_fabm.F90 (modified) (2 diffs)

branches/UKMO/AMM15_v3_6_STABLE_package_collate_bgc_diagnostics/NEMOGCM/NEMO/TOP_SRC/FABM/par_fabm.F90

@@ -28 +28 @@
                       jp_fabm_o2o,  jp_fabm_o3c,  &
                       jp_fabm_o3a,  jp_fabm_o3ph, &
-                      jp_fabm_o3pc, jp_fabm_xeps
+                      jp_fabm_o3pc
 
 #if defined key_fabm

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

@@ -18 +18 @@
    USE trcsms_fabm
    USE fabm_config,ONLY: fabm_create_model_from_yaml_file
-   USE fabm,ONLY: type_external_variable, fabm_initialize_library, &
-                  fabm_get_bulk_diagnostic_data
+   USE fabm,ONLY: type_external_variable, fabm_initialize_library
    USE inputs_fabm,ONLY: initialize_inputs,link_inputs, &
      type_input_variable,type_input_data,type_river_data, &
@@ -111 +110 @@
       jp_fabm_o3ph = fabm_diag_index( 'O3_pH' )
       jp_fabm_o3pc = fabm_diag_index( 'O3_pCO2' )
-      jp_fabm_xeps = fabm_diag_index( 'light_xEPS')
 
       IF (lwp) THEN
@@ -151 +149 @@
             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="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>'
 
@@ -403 +396 @@
 #endif
 
-      ! Initialise visibility
-      visib(:,:,:) = 1.7 / fabm_get_bulk_diagnostic_data(model, jp_fabm_xeps)
-
       ! Log mapping of FABM states:
       IF (lwp) THEN

branches/UKMO/AMM15_v3_6_STABLE_package_collate_bgc_diagnostics/NEMOGCM/NEMO/TOP_SRC/FABM/trcsms_fabm.F90

@@ -37 +37 @@
 
    USE fabm
-   USE par_fabm
 
    IMPLICIT NONE
@@ -119 +118 @@
       CALL trc_bc_read  ( kt )       ! tracers: surface and lateral Boundary Conditions
       CALL trc_rnf_fabm ( kt ) ! River forcings
-      
-      visib(:,:,:) = 1.7 / fabm_get_bulk_diagnostic_data(model, jp_fabm_xeps)
 
       IF( l_trdtrc ) THEN      ! Save the trends in the mixed layer

branches/UKMO/AMM15_v3_6_STABLE_package_collate_bgc_diagnostics/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
@@ -107 +105 @@
              CALL iom_put( model%diagnostic_variables(jn)%name, fabm_get_bulk_diagnostic_data(model,jn))
       END DO
-      zw3d(:,:,:) = visib(:,:,:)*tmask(:,:,:) + 1.e+20*(1.0-tmask(:,:,:))
-      CALL iom_put( 'visib', zw3d )
 
       ! write 2D diagnostics in the file