Improve dependencies for some diagnostics

1. ECOSYS_IFRAC, ECOSYS_XKW, and ECOSYS_ATMPRESS are only available if either lflux_gas_co2 or lflux_gas_o2 are true 2. PV_CO2 and SCHMIDT_CO2 are only available if lflux_gas_co2 is true Adding [1] required adding a mechanism for specifying that only one of a set of dependencies need to evaluate to true (the default behavior is that all dependencies must evaluate to true). I tested this by running with base_bio_on = .false. abio_dic_on = .true. lflux_gas_co2 = .false. And needed to add an if (lflux_gas_co2) block to abio_dic_surface_flux_compute() to avoid seg faults.
mnlevy1981 · Oct 13, 2023 · 70318b8 · 70318b8
1 parent da59455
commit 70318b8
Show file tree

Hide file tree

Showing 17 changed files with 224 additions and 181 deletions.
diff --git a/MARBL_tools/MARBL_share.py b/MARBL_tools/MARBL_share.py
@@ -224,11 +224,19 @@ def meet_dependencies(input_dict, MARBL_settings):
     import logging
     logger = logging.getLogger(__name__)
 
+    dependencies_or = input_dict.get('dependencies_or', False)
     if "dependencies" in input_dict.keys():
-        for dependency in input_dict["dependencies"].keys():
-            if dependency not in MARBL_settings.settings_dict.keys():
-                logger.error("'%s' is not a valid dependency" % dependency)
-                abort(1)
-            if input_dict["dependencies"][dependency] != MARBL_settings.settings_dict[dependency]['value']:
-                return False
+        if dependencies_or:
+            for dependency in input_dict["dependencies"].keys():
+                if dependency in MARBL_settings.settings_dict.keys():
+                    if input_dict["dependencies"][dependency] == MARBL_settings.settings_dict[dependency]['value']:
+                        return True
+            return False
+        else:
+            for dependency in input_dict["dependencies"].keys():
+                if dependency not in MARBL_settings.settings_dict.keys():
+                    logger.error("'%s' is not a valid dependency" % dependency)
+                    abort(1)
+                if input_dict["dependencies"][dependency] != MARBL_settings.settings_dict[dependency]['value']:
+                    return False
     return True
diff --git a/defaults/diagnostics_latest.yaml b/defaults/diagnostics_latest.yaml
@@ -22,6 +22,10 @@
 ####################
 
 ECOSYS_IFRAC :
+   dependencies :
+      lflux_gas_o2 : .true.
+      lflux_gas_co2 : .true.
+   dependencies_or : true
    longname : Ice Fraction
    units : fraction
    vertical_grid : none
@@ -32,6 +36,10 @@ ECOSYS_IFRAC :
       - average
       - average
 ECOSYS_XKW :
+   dependencies :
+      lflux_gas_o2 : .true.
+      lflux_gas_co2 : .true.
+   dependencies_or : true
    longname : XKW
    units : cm/s
    vertical_grid : none
@@ -42,18 +50,26 @@ ECOSYS_XKW :
       - average
       - average
 ECOSYS_ATM_PRESS :
+   dependencies :
+      lflux_gas_o2 : .true.
+      lflux_gas_co2 : .true.
+   dependencies_or : true
    longname : Atmospheric Pressure
    units : atmospheres
    vertical_grid : none
    frequency : medium
    operator : average
 PV_CO2 :
+   dependencies :
+      lflux_gas_co2 : .true.
    longname : CO2 Piston Velocity
    units : cm/s
    vertical_grid : none
    frequency : never
    operator : average
 SCHMIDT_CO2 :
+   dependencies :
+      lflux_gas_co2 : .true.
    longname : CO2 Schmidt Number for base biotic tracers fluxes
    units : 1
    vertical_grid : none

diff --git a/defaults/json/diagnostics_latest.json b/defaults/json/diagnostics_latest.json
@@ -1529,13 +1529,23 @@
       "vertical_grid": "none"
    },
    "ECOSYS_ATM_PRESS": {
+      "dependencies": {
+         "lflux_gas_co2": ".true.",
+         "lflux_gas_o2": ".true."
+      },
+      "dependencies_or": true,
       "frequency": "medium",
       "longname": "Atmospheric Pressure",
       "operator": "average",
       "units": "atmospheres",
       "vertical_grid": "none"
    },
    "ECOSYS_IFRAC": {
+      "dependencies": {
+         "lflux_gas_co2": ".true.",
+         "lflux_gas_o2": ".true."
+      },
+      "dependencies_or": true,
       "frequency": [
          "medium",
          "high"
@@ -1549,6 +1559,11 @@
       "vertical_grid": "none"
    },
    "ECOSYS_XKW": {
+      "dependencies": {
+         "lflux_gas_co2": ".true.",
+         "lflux_gas_o2": ".true."
+      },
+      "dependencies_or": true,
       "frequency": [
          "medium",
          "high"
@@ -2137,6 +2152,9 @@
       "vertical_grid": "layer_avg"
    },
    "PV_CO2": {
+      "dependencies": {
+         "lflux_gas_co2": ".true."
+      },
       "frequency": "never",
       "longname": "CO2 Piston Velocity",
       "operator": "average",
@@ -2205,6 +2223,9 @@
       "vertical_grid": "layer_avg"
    },
    "SCHMIDT_CO2": {
+      "dependencies": {
+         "lflux_gas_co2": ".true."
+      },
       "frequency": "medium",
       "longname": "CO2 Schmidt Number for base biotic tracers fluxes",
       "operator": "average",

diff --git a/defaults/json/settings_cesm2.0.json b/defaults/json/settings_cesm2.0.json
@@ -1139,7 +1139,6 @@
       "lflux_gas_co2": {
          "datatype": "logical",
          "default_value": ".true.",
-         "dependencies": "base_bio_on",
          "longname": "Control which portions of code are executed (useful for debugging)",
          "subcategory": "3. config flags",
          "units": "unitless"

diff --git a/defaults/json/settings_cesm2.1+cocco.json b/defaults/json/settings_cesm2.1+cocco.json
@@ -1181,7 +1181,6 @@
       "lflux_gas_co2": {
          "datatype": "logical",
          "default_value": ".true.",
-         "dependencies": "base_bio_on",
          "longname": "Control which portions of code are executed (useful for debugging)",
          "subcategory": "3. config flags",
          "units": "unitless"

diff --git a/defaults/json/settings_cesm2.1.json b/defaults/json/settings_cesm2.1.json
@@ -1139,7 +1139,6 @@
       "lflux_gas_co2": {
          "datatype": "logical",
          "default_value": ".true.",
-         "dependencies": "base_bio_on",
          "longname": "Control which portions of code are executed (useful for debugging)",
          "subcategory": "3. config flags",
          "units": "unitless"

diff --git a/defaults/json/settings_latest+4p2z.json b/defaults/json/settings_latest+4p2z.json
@@ -1234,7 +1234,6 @@
       "lflux_gas_co2": {
          "datatype": "logical",
          "default_value": ".true.",
-         "dependencies": "base_bio_on",
          "longname": "Control which portions of code are executed (useful for debugging)",
          "subcategory": "3. config flags",
          "units": "unitless"

diff --git a/defaults/json/settings_latest+cocco.json b/defaults/json/settings_latest+cocco.json
@@ -1181,7 +1181,6 @@
       "lflux_gas_co2": {
          "datatype": "logical",
          "default_value": ".true.",
-         "dependencies": "base_bio_on",
          "longname": "Control which portions of code are executed (useful for debugging)",
          "subcategory": "3. config flags",
          "units": "unitless"

diff --git a/defaults/json/settings_latest.json b/defaults/json/settings_latest.json
@@ -1145,7 +1145,6 @@
       "lflux_gas_co2": {
          "datatype": "logical",
          "default_value": ".true.",
-         "dependencies": "base_bio_on",
          "longname": "Control which portions of code are executed (useful for debugging)",
          "subcategory": "3. config flags",
          "units": "unitless"

diff --git a/defaults/settings_cesm2.0.yaml b/defaults/settings_cesm2.0.yaml
@@ -332,7 +332,6 @@ general_parms :
       datatype : logical
       default_value : .true.
    lflux_gas_co2 :
-      dependencies : base_bio_on
       longname : Control which portions of code are executed (useful for debugging)
       subcategory : 3. config flags
       units : unitless

diff --git a/defaults/settings_cesm2.1+cocco.yaml b/defaults/settings_cesm2.1+cocco.yaml
@@ -334,7 +334,6 @@ general_parms :
       datatype : logical
       default_value : .true.
    lflux_gas_co2 :
-      dependencies : base_bio_on
       longname : Control which portions of code are executed (useful for debugging)
       subcategory : 3. config flags
       units : unitless

diff --git a/defaults/settings_cesm2.1.yaml b/defaults/settings_cesm2.1.yaml
@@ -332,7 +332,6 @@ general_parms :
       datatype : logical
       default_value : .true.
    lflux_gas_co2 :
-      dependencies : base_bio_on
       longname : Control which portions of code are executed (useful for debugging)
       subcategory : 3. config flags
       units : unitless

diff --git a/defaults/settings_latest+4p2z.yaml b/defaults/settings_latest+4p2z.yaml
@@ -350,7 +350,6 @@ general_parms :
       datatype : logical
       default_value : .true.
    lflux_gas_co2 :
-      dependencies : base_bio_on
       longname : Control which portions of code are executed (useful for debugging)
       subcategory : 3. config flags
       units : unitless

diff --git a/defaults/settings_latest+cocco.yaml b/defaults/settings_latest+cocco.yaml
@@ -334,7 +334,6 @@ general_parms :
       datatype : logical
       default_value : .true.
    lflux_gas_co2 :
-      dependencies : base_bio_on
       longname : Control which portions of code are executed (useful for debugging)
       subcategory : 3. config flags
       units : unitless

diff --git a/defaults/settings_latest.yaml b/defaults/settings_latest.yaml
@@ -334,7 +334,6 @@ general_parms :
       datatype : logical
       default_value : .true.
    lflux_gas_co2 :
-      dependencies : base_bio_on
       longname : Control which portions of code are executed (useful for debugging)
       subcategory : 3. config flags
       units : unitless