remove Jint_100m_*tot diagnostics

change default frequency of full-depth Jint_*tot diagnostics to never misc code cleanup Testing: marbl_dev_klindsay_n113_marbl_dev_n78_cesm_pop_2_1_20180205 aux_pop_MARBL cheyenne/{intel,gnu}: (baseline comparison to previous commit on bugfix/1 branch) except for tests mentioned below, all tests pass some MEMCOMP failures Files Modified: modified: autogenerated_src/default_diagnostics.json modified: src/default_diagnostics.yaml modified: src/marbl_ciso_mod.F90 modified: src/marbl_diagnostics_mod.F90
marbl-ecosys · Mar 19, 2018 · 9920895 · 9920895
1 parent 9b765a6
commit 9920895
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 239 deletions.
diff --git a/autogenerated_src/default_diagnostics.json b/autogenerated_src/default_diagnostics.json
@@ -580,31 +580,11 @@
       "units": "mmol/m^3 cm/s",
       "vertical_grid": "none"
    },
-   "CISO_Jint_100m_13Ctot": {
-      "dependencies": {
-         "ciso_on": ".true."
-      },
-      "frequency": "medium",
-      "longname": "13Ctot Source Sink Term Vertical Integral, 0-100m",
-      "operator": "average",
-      "units": "mmol/m^3 cm/s",
-      "vertical_grid": "none"
-   },
-   "CISO_Jint_100m_14Ctot": {
-      "dependencies": {
-         "ciso_on": ".true."
-      },
-      "frequency": "medium",
-      "longname": "14Ctot Source Sink Term Vertical Integral, 0-100m",
-      "operator": "average",
-      "units": "mmol/m^3 cm/s",
-      "vertical_grid": "none"
-   },
    "CISO_Jint_13Ctot": {
       "dependencies": {
          "ciso_on": ".true."
       },
-      "frequency": "medium",
+      "frequency": "never",
       "longname": "13Ctot Source Sink Term Vertical Integral",
       "operator": "average",
       "units": "mmol/m^3 cm/s",
@@ -614,7 +594,7 @@
       "dependencies": {
          "ciso_on": ".true."
       },
-      "frequency": "medium",
+      "frequency": "never",
       "longname": "14Ctot Source Sink Term Vertical Integral",
       "operator": "average",
       "units": "mmol/m^3 cm/s",
@@ -1326,71 +1306,36 @@
       "units": "mmol/m^2/s",
       "vertical_grid": "none"
    },
-   "Jint_100m_Ctot": {
-      "frequency": "medium",
-      "longname": "Vertical Integral of Conservative Subterms of Source Sink Term for Ctot, 0-100m",
-      "operator": "average",
-      "units": "mmol/m^3 cm/s",
-      "vertical_grid": "none"
-   },
-   "Jint_100m_Fetot": {
-      "frequency": "medium",
-      "longname": "Vertical Integral of Conservative Subterms of Source Sink Term for Fetot, 0-100m",
-      "operator": "average",
-      "units": "mmol/m^3 cm/s",
-      "vertical_grid": "none"
-   },
-   "Jint_100m_Ntot": {
-      "frequency": "medium",
-      "longname": "Vertical Integral of Conservative Subterms of Source Sink Term for Ntot, 0-100m",
-      "operator": "average",
-      "units": "mmol/m^3 cm/s",
-      "vertical_grid": "none"
-   },
-   "Jint_100m_Ptot": {
-      "frequency": "medium",
-      "longname": "Vertical Integral of Conservative Subterms of Source Sink Term for Ptot, 0-100m",
-      "operator": "average",
-      "units": "mmol/m^3 cm/s",
-      "vertical_grid": "none"
-   },
-   "Jint_100m_Sitot": {
-      "frequency": "medium",
-      "longname": "Vertical Integral of Conservative Subterms of Source Sink Term for Sitot, 0-100m",
-      "operator": "average",
-      "units": "mmol/m^3 cm/s",
-      "vertical_grid": "none"
-   },
    "Jint_Ctot": {
-      "frequency": "medium",
+      "frequency": "never",
       "longname": "Vertical Integral of Conservative Subterms of Source Sink Term for Ctot",
       "operator": "average",
       "units": "mmol/m^3 cm/s",
       "vertical_grid": "none"
    },
    "Jint_Fetot": {
-      "frequency": "medium",
+      "frequency": "never",
       "longname": "Vertical Integral of Conservative Subterms of Source Sink Term for Fetot",
       "operator": "average",
       "units": "mmol/m^3 cm/s",
       "vertical_grid": "none"
    },
    "Jint_Ntot": {
-      "frequency": "medium",
+      "frequency": "never",
       "longname": "Vertical Integral of Conservative Subterms of Source Sink Term for Ntot",
       "operator": "average",
       "units": "mmol/m^3 cm/s",
       "vertical_grid": "none"
    },
    "Jint_Ptot": {
-      "frequency": "medium",
+      "frequency": "never",
       "longname": "Vertical Integral of Conservative Subterms of Source Sink Term for Ptot",
       "operator": "average",
       "units": "mmol/m^3 cm/s",
       "vertical_grid": "none"
    },
    "Jint_Sitot": {
-      "frequency": "medium",
+      "frequency": "never",
       "longname": "Vertical Integral of Conservative Subterms of Source Sink Term for Sitot",
       "operator": "average",
       "units": "mmol/m^3 cm/s",

diff --git a/src/default_diagnostics.yaml b/src/default_diagnostics.yaml
@@ -414,61 +414,31 @@ Jint_Ctot :
    longname : Vertical Integral of Conservative Subterms of Source Sink Term for Ctot
    units : mmol/m^3 cm/s
    vertical_grid : none
-   frequency : medium
-   operator : average
-Jint_100m_Ctot :
-   longname : Vertical Integral of Conservative Subterms of Source Sink Term for Ctot, 0-100m
-   units : mmol/m^3 cm/s
-   vertical_grid : none
-   frequency : medium
+   frequency : never
    operator : average
 Jint_Ntot :
    longname : Vertical Integral of Conservative Subterms of Source Sink Term for Ntot
    units : mmol/m^3 cm/s
    vertical_grid : none
-   frequency : medium
-   operator : average
-Jint_100m_Ntot :
-   longname : Vertical Integral of Conservative Subterms of Source Sink Term for Ntot, 0-100m
-   units : mmol/m^3 cm/s
-   vertical_grid : none
-   frequency : medium
+   frequency : never
    operator : average
 Jint_Ptot :
    longname : Vertical Integral of Conservative Subterms of Source Sink Term for Ptot
    units : mmol/m^3 cm/s
    vertical_grid : none
-   frequency : medium
-   operator : average
-Jint_100m_Ptot :
-   longname : Vertical Integral of Conservative Subterms of Source Sink Term for Ptot, 0-100m
-   units : mmol/m^3 cm/s
-   vertical_grid : none
-   frequency : medium
+   frequency : never
    operator : average
 Jint_Sitot :
    longname : Vertical Integral of Conservative Subterms of Source Sink Term for Sitot
    units : mmol/m^3 cm/s
    vertical_grid : none
-   frequency : medium
-   operator : average
-Jint_100m_Sitot :
-   longname : Vertical Integral of Conservative Subterms of Source Sink Term for Sitot, 0-100m
-   units : mmol/m^3 cm/s
-   vertical_grid : none
-   frequency : medium
+   frequency : never
    operator : average
 Jint_Fetot :
    longname : Vertical Integral of Conservative Subterms of Source Sink Term for Fetot
    units : mmol/m^3 cm/s
    vertical_grid : none
-   frequency : medium
-   operator : average
-Jint_100m_Fetot :
-   longname : Vertical Integral of Conservative Subterms of Source Sink Term for Fetot, 0-100m
-   units : mmol/m^3 cm/s
-   vertical_grid : none
-   frequency : medium
+   frequency : never
    operator : average
 
 # Particulate 2D diags
@@ -1056,31 +1026,15 @@ CISO_Jint_13Ctot :
    longname : 13Ctot Source Sink Term Vertical Integral
    units : mmol/m^3 cm/s
    vertical_grid : none
-   frequency : medium
+   frequency : never
    operator : average
 CISO_Jint_14Ctot :
    dependencies :
       ciso_on : .true.
    longname : 14Ctot Source Sink Term Vertical Integral
    units : mmol/m^3 cm/s
    vertical_grid : none
-   frequency : medium
-   operator : average
-CISO_Jint_100m_13Ctot :
-   dependencies :
-      ciso_on : .true.
-   longname : 13Ctot Source Sink Term Vertical Integral, 0-100m
-   units : mmol/m^3 cm/s
-   vertical_grid : none
-   frequency : medium
-   operator : average
-CISO_Jint_100m_14Ctot :
-   dependencies :
-      ciso_on : .true.
-   longname : 14Ctot Source Sink Term Vertical Integral, 0-100m
-   units : mmol/m^3 cm/s
-   vertical_grid : none
-   frequency : medium
+   frequency : never
    operator : average
 calcToSed_13C :
    dependencies :

diff --git a/src/marbl_ciso_mod.F90 b/src/marbl_ciso_mod.F90
@@ -870,29 +870,29 @@ subroutine marbl_ciso_set_interior_forcing( &
        autotroph_d14C,      &
        autotrophCaCO3_d13C, &
        autotrophCaCO3_d14C, &
-       DIC_d13C,            &
-       DIC_d14C,            &
-       DOCtot_d13C,         &
-       DOCtot_d14C,         &
-       zooC_d13C,           &
-       zooC_d14C,           &
        photo13C,            &
        photo14C,            &
        eps_autotroph,       &
        mui_to_co2star,      &
        Ca13CO3_prod,        &
        Ca14CO3_prod,        &
+       DIC_d13C,            &
+       DIC_d14C,            &
+       DOCtot_d13C,         &
+       DOCtot_d14C,         &
+       zooC_d13C,           &
+       zooC_d14C,           &
        DO13Ctot_prod,       &
        DO14Ctot_prod,       &
        DO13Ctot_remin,      &
        DO14Ctot_remin,      &
        eps_aq_g,            &
        eps_dic_g,           &
+       decay_14Ctot,        &
        PO13C,               &
        PO14C,               &
        P_Ca13CO3,           &
        P_Ca14CO3,           &
-       decay_14Ctot,        &
        column_dtracer,      &
        marbl_tracer_indices,&
        marbl_interior_diags,&