Clean up diagnostic names

Remove "in permil" from long name of variables ("permil" is already noted in the "units" attribute) and dropped "for base biotic tracer fluxes" from the few variables where I had added it. Also updated the long name of the abiotic derivative diagnostics to refer to ABIO_FG_DIC (what the diagnostic is called) instead of STF_ABIO_DIC.
mnlevy1981 · Oct 13, 2023 · 149c0c0 · 149c0c0
1 parent 82c85a3
commit 149c0c0
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 37 deletions.
diff --git a/defaults/diagnostics_latest.yaml b/defaults/diagnostics_latest.yaml
@@ -22,7 +22,7 @@
 ####################
 
 ECOSYS_IFRAC :
-   longname : Ice Fraction for base biotic tracer fluxes # Want more consistent capitalization
+   longname : Ice Fraction
    units : fraction
    vertical_grid : none
    frequency :
@@ -32,7 +32,7 @@ ECOSYS_IFRAC :
       - average
       - average
 ECOSYS_XKW :
-   longname : XKW for base biotic tracer fluxes # Want more consistent capitalization
+   longname : XKW
    units : cm/s
    vertical_grid : none
    frequency :
@@ -42,13 +42,13 @@ ECOSYS_XKW :
       - average
       - average
 ECOSYS_ATM_PRESS :
-   longname : Atmospheric Pressure for base biotic tracer fluxes # Want more consistent capitalization
+   longname : Atmospheric Pressure
    units : atmospheres
    vertical_grid : none
    frequency : medium
    operator : average
 PV_CO2 :
-   longname : CO2 Piston Velocity for base biotic tracer fluxes
+   longname : CO2 Piston Velocity
    units : cm/s
    vertical_grid : none
    frequency : never
@@ -126,7 +126,7 @@ pCO2SURF_ALT_CO2 :
 DpCO2 : &DpCO2
    dependencies :
       base_bio_on : .true.
-   longname : D pCO2 for base biotic tracer fluxes
+   longname : D pCO2
    units : ppmv
    vertical_grid : none
    frequency :
@@ -235,7 +235,7 @@ ABIO_pCO2 :
 ABIO_D14C_atm :
    dependencies :
       abio_dic_on : .true.
-   longname : Atmospheric Delta 14C in permil for Abiotic DIC tracer fluxes
+   longname : Atmospheric Delta 14C for Abiotic DIC tracer fluxes
    units : permil
    vertical_grid : none
    frequency : medium
@@ -308,7 +308,7 @@ d_SF_ABIO_DIC_d_ABIO_DIC :
    dependencies :
       abio_dic_on : .true.
       labio_derivative_diags : .true.
-   longname : Derivative of STF_ABIO_DIC wrt ABIO_DIC
+   longname : Derivative of ABIO_FG_DIC wrt ABIO_DIC
    units : cm/s
    vertical_grid : none
    frequency : never
@@ -317,7 +317,7 @@ d_SF_ABIO_DI14C_d_ABIO_DIC :
    dependencies :
       abio_dic_on : .true.
       labio_derivative_diags : .true.
-   longname : Derivative of STF_ABIO_DI14C wrt ABIO_DIC
+   longname : Derivative of ABIO_FG_DI14C wrt ABIO_DIC
    units : cm/s
    vertical_grid : none
    frequency : never
@@ -326,7 +326,7 @@ d_SF_ABIO_DI14C_d_ABIO_DI14C :
    dependencies :
       abio_dic_on : .true.
       labio_derivative_diags : .true.
-   longname : Derivative of STF_ABIO_DI14C wrt ABIO_DI14C
+   longname : Derivative of ABIO_FG_DI14C wrt ABIO_DI14C
    units : cm/s
    vertical_grid : none
    frequency : never
@@ -371,7 +371,7 @@ CISO_FG_d13C :
 CISO_D13C_atm :
    dependencies :
       ciso_on : .true.
-   longname : Atmospheric Delta 13C in permil
+   longname : Atmospheric Delta 13C
    units : permil
    vertical_grid : none
    frequency : medium
@@ -443,7 +443,7 @@ CISO_FG_d14C :
 CISO_D14C_atm :
    dependencies :
       ciso_on : .true.
-   longname : Atmospheric Delta 14C in permil
+   longname : Atmospheric Delta 14C
    units : permil
    vertical_grid : none
    frequency : medium
@@ -1443,7 +1443,7 @@ Nfix :
 ABIO_D14C_ocn :
    dependencies :
       abio_dic_on : .true.
-   longname : Oceanic Delta 14C in permil for Abiotic DIC tracer fluxes
+   longname : Oceanic Delta 14C for Abiotic DIC tracer fluxes
    units : permil
    vertical_grid : layer_avg
    frequency : medium

diff --git a/defaults/json/diagnostics_latest.json b/defaults/json/diagnostics_latest.json
@@ -383,7 +383,7 @@
          "abio_dic_on": ".true."
       },
       "frequency": "medium",
-      "longname": "Atmospheric Delta 14C in permil for Abiotic DIC tracer fluxes",
+      "longname": "Atmospheric Delta 14C for Abiotic DIC tracer fluxes",
       "operator": "average",
       "units": "permil",
       "vertical_grid": "none"
@@ -393,7 +393,7 @@
          "abio_dic_on": ".true."
       },
       "frequency": "medium",
-      "longname": "Oceanic Delta 14C in permil for Abiotic DIC tracer fluxes",
+      "longname": "Oceanic Delta 14C for Abiotic DIC tracer fluxes",
       "operator": "average",
       "units": "permil",
       "vertical_grid": "layer_avg"
@@ -609,7 +609,7 @@
          "ciso_on": ".true."
       },
       "frequency": "medium",
-      "longname": "Atmospheric Delta 13C in permil",
+      "longname": "Atmospheric Delta 13C",
       "operator": "average",
       "units": "permil",
       "vertical_grid": "none"
@@ -619,7 +619,7 @@
          "ciso_on": ".true."
       },
       "frequency": "medium",
-      "longname": "Atmospheric Delta 14C in permil",
+      "longname": "Atmospheric Delta 14C",
       "operator": "average",
       "units": "permil",
       "vertical_grid": "none"
@@ -1510,7 +1510,7 @@
          "medium",
          "high"
       ],
-      "longname": "D pCO2 for base biotic tracer fluxes",
+      "longname": "D pCO2",
       "operator": [
          "average",
          "average"
@@ -1530,7 +1530,7 @@
    },
    "ECOSYS_ATM_PRESS": {
       "frequency": "medium",
-      "longname": "Atmospheric Pressure for base biotic tracer fluxes",
+      "longname": "Atmospheric Pressure",
       "operator": "average",
       "units": "atmospheres",
       "vertical_grid": "none"
@@ -1540,7 +1540,7 @@
          "medium",
          "high"
       ],
-      "longname": "Ice Fraction for base biotic tracer fluxes",
+      "longname": "Ice Fraction",
       "operator": [
          "average",
          "average"
@@ -1553,7 +1553,7 @@
          "medium",
          "high"
       ],
-      "longname": "XKW for base biotic tracer fluxes",
+      "longname": "XKW",
       "operator": [
          "average",
          "average"
@@ -2138,7 +2138,7 @@
    },
    "PV_CO2": {
       "frequency": "never",
-      "longname": "CO2 Piston Velocity for base biotic tracer fluxes",
+      "longname": "CO2 Piston Velocity",
       "operator": "average",
       "units": "cm/s",
       "vertical_grid": "none"
@@ -2367,7 +2367,7 @@
          "labio_derivative_diags": ".true."
       },
       "frequency": "never",
-      "longname": "Derivative of STF_ABIO_DI14C wrt ABIO_DI14C",
+      "longname": "Derivative of ABIO_FG_DI14C wrt ABIO_DI14C",
       "operator": "average",
       "units": "cm/s",
       "vertical_grid": "none"
@@ -2378,7 +2378,7 @@
          "labio_derivative_diags": ".true."
       },
       "frequency": "never",
-      "longname": "Derivative of STF_ABIO_DI14C wrt ABIO_DIC",
+      "longname": "Derivative of ABIO_FG_DI14C wrt ABIO_DIC",
       "operator": "average",
       "units": "cm/s",
       "vertical_grid": "none"
@@ -2389,7 +2389,7 @@
          "labio_derivative_diags": ".true."
       },
       "frequency": "never",
-      "longname": "Derivative of STF_ABIO_DIC wrt ABIO_DIC",
+      "longname": "Derivative of ABIO_FG_DIC wrt ABIO_DIC",
       "operator": "average",
       "units": "cm/s",
       "vertical_grid": "none"

diff --git a/src/marbl_abio_dic_diagnostics_mod.F90 b/src/marbl_abio_dic_diagnostics_mod.F90
@@ -79,7 +79,7 @@ subroutine marbl_abio_dic_diagnostics_init( &
        return
       end if
 
-      lname    = 'Atmospheric Delta 14C in permil for Abiotic DIC tracer fluxes'
+      lname    = 'Atmospheric Delta 14C for Abiotic DIC tracer fluxes'
       sname    = 'ABIO_D14C_atm'
       units    = 'permil'
       vgrid    = 'none'
@@ -151,7 +151,6 @@ subroutine marbl_abio_dic_diagnostics_init( &
        return
       end if
 
-
       lname    = 'Surface Alkalinity for Abiotic DIC tracer fluxes'
       sname    = 'ABIO_ALK_SURF'
       units    = unit_system%alk_conc_units
@@ -189,7 +188,7 @@ subroutine marbl_abio_dic_diagnostics_init( &
       end if
 
       if (labio_derivative_diags) then
-        lname    = 'Derivative of STF_ABIO_DIC wrt ABIO_DIC'
+        lname    = 'Derivative of ABIO_FG_DIC wrt ABIO_DIC'
         sname    = 'd_SF_ABIO_DIC_d_ABIO_DIC'
         units    = vel_units
         vgrid    = 'none'
@@ -201,7 +200,7 @@ subroutine marbl_abio_dic_diagnostics_init( &
          return
         end if
 
-        lname    = 'Derivative of STF_ABIO_DI14C wrt ABIO_DIC'
+        lname    = 'Derivative of ABIO_FG_DI14C wrt ABIO_DIC'
         sname    = 'd_SF_ABIO_DI14C_d_ABIO_DIC'
         units    = vel_units
         vgrid    = 'none'
@@ -213,7 +212,7 @@ subroutine marbl_abio_dic_diagnostics_init( &
           return
         end if
 
-        lname    = 'Derivative of STF_ABIO_DI14C wrt ABIO_DI14C'
+        lname    = 'Derivative of ABIO_FG_DI14C wrt ABIO_DI14C'
         sname    = 'd_SF_ABIO_DI14C_d_ABIO_DI14C'
         units    = vel_units
         vgrid    = 'none'
@@ -237,7 +236,7 @@ subroutine marbl_abio_dic_diagnostics_init( &
               diags => marbl_interior_tendency_diags &
              )
 
-      lname    = 'Oceanic Delta 14C in permil for Abiotic DIC tracer fluxes'
+      lname    = 'Oceanic Delta 14C for Abiotic DIC tracer fluxes'
       sname    = 'ABIO_D14C_ocn'
       units    = 'permil'
       vgrid    = 'layer_avg'

diff --git a/src/marbl_ciso_diagnostics_mod.F90 b/src/marbl_ciso_diagnostics_mod.F90
@@ -113,7 +113,7 @@ subroutine marbl_ciso_diagnostics_init( &
        return
       end if
 
-      lname    = 'Atmospheric Delta 13C in permil'
+      lname    = 'Atmospheric Delta 13C'
       sname    = 'CISO_D13C_atm'
       units    = 'permil'
       vgrid    = 'none'
@@ -221,7 +221,7 @@ subroutine marbl_ciso_diagnostics_init( &
        return
       end if
 
-      lname    = 'Atmospheric Delta 14C in permil'
+      lname    = 'Atmospheric Delta 14C'
       sname    = 'CISO_D14C_atm'
       units    = 'permil'
       vgrid    = 'none'

diff --git a/src/marbl_diagnostics_mod.F90 b/src/marbl_diagnostics_mod.F90
@@ -130,7 +130,7 @@ subroutine marbl_diagnostics_init(  &
               diags => marbl_surface_flux_diags   &
              )
 
-      lname    = 'Ice Fraction for base biotic tracer fluxes'
+      lname    = 'Ice Fraction'
       sname    = 'ECOSYS_IFRAC'
       units    = 'fraction'
       vgrid    = 'none'
@@ -142,7 +142,7 @@ subroutine marbl_diagnostics_init(  &
         return
       end if
 
-      lname    = 'XKW for base biotic tracer fluxes'
+      lname    = 'XKW'
       sname    = 'ECOSYS_XKW'
       units    = vel_units
       vgrid    = 'none'
@@ -154,7 +154,7 @@ subroutine marbl_diagnostics_init(  &
         return
       end if
 
-      lname    = 'Atmospheric Pressure for base biotic tracer fluxes'
+      lname    = 'Atmospheric Pressure'
       sname    = 'ECOSYS_ATM_PRESS'
       units    = 'atmospheres'
       vgrid    = 'none'
@@ -166,7 +166,7 @@ subroutine marbl_diagnostics_init(  &
         return
       end if
 
-      lname    = 'CO2 Piston Velocity for base biotic tracer fluxes'
+      lname    = 'CO2 Piston Velocity'
       sname    = 'PV_CO2'
       units    = vel_units
       vgrid    = 'none'
@@ -263,7 +263,7 @@ subroutine marbl_diagnostics_init(  &
           return
         end if
 
-        lname    = 'D pCO2 for base biotic tracer fluxes'
+        lname    = 'D pCO2'
         sname    = 'DpCO2'
         units    = 'ppmv'
         vgrid    = 'none'