From ed54e41a155b2a41122fcd179491c62cdbe17eb8 Mon Sep 17 00:00:00 2001
From: Keith Lindsay <klindsay@ucar.edu>
Date: Sun, 12 Mar 2023 06:02:23 -0600
Subject: [PATCH] update CFC_BC_FILE to point to grid independent file of    
 timeseries of atm CFC mole fraction hemispheric averages

update corresponding line in input_data_list
---
 param_templates/MOM_input.yaml            | 6 ++----
 param_templates/input_data_list.yaml      | 3 +--
 param_templates/json/MOM_input.json       | 6 ++----
 param_templates/json/input_data_list.json | 4 +---
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/param_templates/MOM_input.yaml b/param_templates/MOM_input.yaml
index 0bedcddd..8992a60e 100644
--- a/param_templates/MOM_input.yaml
+++ b/param_templates/MOM_input.yaml
@@ -334,11 +334,9 @@ Global:
     CFC_BC_FILE:
         description: |
             "The file in which the CFC-11 and CFC-12 atm concentrations can be found (units
-            must be parts per trillion), or an empty string for internal BC generation
-            (TODO)."
+            must be parts per trillion)."
         datatype: string
-        value:
-            $OCN_GRID == "tx0.66v1": "CFCs_tx0.66v1_v2_5_210430.nc"
+        value: "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/cfc_atm_20230310.nc"
     COORD_CONFIG:
         description: |
             "This specifies how layers are to be defined:
diff --git a/param_templates/input_data_list.yaml b/param_templates/input_data_list.yaml
index dba5b2ab..3ae98cb8 100644
--- a/param_templates/input_data_list.yaml
+++ b/param_templates/input_data_list.yaml
@@ -36,8 +36,7 @@ mom.input_data_list:
     ocean_seaw:
         $OCN_GRID == "tx0.25v1": "${INPUTDIR}/seawifs-clim-1997-2010.1440x1080.v20180328.nc"
         $OCN_GRID == "tx0.66v1": "${INPUTDIR}/seawifs-clim-1997-2010-tx0.66v1.nc"
-    cfcs_forcing:
-        $OCN_GRID == "tx0.66v1": "${INPUTDIR}/CFCs_tx0.66v1_v2_5_210430.nc"
+    cfcs_forcing: "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/cfc_atm_20230310.nc"
     diag_coord_def_rho2:
         $OCN_GRID == "tx0.66v1": "${INPUTDIR}/ocean_rho2_190917.nc"
 ...
diff --git a/param_templates/json/MOM_input.json b/param_templates/json/MOM_input.json
index be643d53..8cf99601 100644
--- a/param_templates/json/MOM_input.json
+++ b/param_templates/json/MOM_input.json
@@ -234,11 +234,9 @@
          "value": false
       },
       "CFC_BC_FILE": {
-         "description": "\"The file in which the CFC-11 and CFC-12 atm concentrations can be found (units\nmust be parts per trillion), or an empty string for internal BC generation\n(TODO).\"\n",
+         "description": "\"The file in which the CFC-11 and CFC-12 atm concentrations can be found (units\nmust be parts per trillion).\"\n",
          "datatype": "string",
-         "value": {
-            "$OCN_GRID == \"tx0.66v1\"": "CFCs_tx0.66v1_v2_5_210430.nc"
-         }
+         "value": "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/cfc_atm_20230310.nc"
       },
       "COORD_CONFIG": {
          "description": "\"This specifies how layers are to be defined:\nfile - read coordinate information from the file\nspecified by (COORD_FILE).\nlinear - linear based on interfaces not layesrs.\nts_ref - use reference temperature and salinity\nts_range - use range of temperature and salinity\n(T_REF and S_REF) to determine surface density\nand GINT calculate internal densities.\ngprime - use reference density (RHO_0) for surface\ndensity and GINT calculate internal densities.\nts_profile - use temperature and salinity profiles\n(read from COORD_FILE) to set layer densities.\nUSER - call a user modified routine.\nThe file from which the coordinate densities are read.\"\n",
diff --git a/param_templates/json/input_data_list.json b/param_templates/json/input_data_list.json
index 985de4ed..64098e8c 100644
--- a/param_templates/json/input_data_list.json
+++ b/param_templates/json/input_data_list.json
@@ -47,9 +47,7 @@
          "$OCN_GRID == \"tx0.25v1\"": "${INPUTDIR}/seawifs-clim-1997-2010.1440x1080.v20180328.nc",
          "$OCN_GRID == \"tx0.66v1\"": "${INPUTDIR}/seawifs-clim-1997-2010-tx0.66v1.nc"
       },
-      "cfcs_forcing": {
-         "$OCN_GRID == \"tx0.66v1\"": "${INPUTDIR}/CFCs_tx0.66v1_v2_5_210430.nc"
-      },
+      "cfcs_forcing": "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/cfc_atm_20230310.nc",
       "diag_coord_def_rho2": {
          "$OCN_GRID == \"tx0.66v1\"": "${INPUTDIR}/ocean_rho2_190917.nc"
       }