Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update CFC_BC_FILE to point to grid independent file of #132

Merged
merged 1 commit into from
Mar 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions param_templates/MOM_input.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions param_templates/input_data_list.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
...
6 changes: 2 additions & 4 deletions param_templates/json/MOM_input.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 1 addition & 3 deletions param_templates/json/input_data_list.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down