Skip to content

Jedwards/namelist cleanup #49

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.

Sign up for GitHub

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

Merged
jedwards4b merged 5 commits into from
Feb 4, 2021
Merged

Jedwards/namelist cleanup #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c6b1ac
replace datm_clmncep_yr and datm_cplhist_yr with datm_yr
jedwards4b Feb 1, 2021
f36b2fe
namelist cleanup
jedwards4b Feb 1, 2021
52b8b40
Merge branch 'master' into jedwards/namelist_cleanup
jedwards4b Feb 1, 2021
b9bb065
remove scol_mode
jedwards4b Feb 1, 2021
b278ec1
update logic for single column
jedwards4b Feb 2, 2021
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: 4 additions & 2 deletions datm/cime_config/buildnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,10 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path
config['datm_co2_tseries'] = datm_co2_tseries
config['datm_presaero'] = datm_presaero
config['cime_model'] = get_model()
config['scol_mode'] = 'true' if case.get_value('PTS_MODE') else 'false'
config['create_mesh'] = 'true' if case.get_value("ATM_DOMAIN_MESH") == 'create_mesh' else 'false'
if case.get_value('PTS_MODE'):
config['mode'] = 'single_column'
else:
config['mode'] = case.get_value("ATM_DOMAIN_MESH")

nmlgen.init_defaults(infile, config)

Expand Down
75 changes: 24 additions & 51 deletions datm/cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,46 +159,7 @@
<desc>case name used to determine stream filenames when DATM_MODE is CPLHIST</desc>
</entry>

<entry id="DATM_CPLHIST_YR_ALIGN">
<type>integer</type>
<valid_values></valid_values>
<default_value>-999</default_value>
<group>run_component_datm</group>
<file>env_run.xml</file>
<desc>
Simulation year corresponding to DATM_CPLHIST_YR_START (only used
when DATM_MODE is CPLHIST). A common usage is to set this to
RUN_STARTDATE. With this setting, the forcing in the first year of
the run will be the forcing of year DATM_CPLHIST_YR_START. Another
use case is to align the calendar of transient forcing with the
model calendar. For example, setting
DATM_CPLHIST_YR_ALIGN=DATM_CPLHIST_YR_START will lead to the
forcing calendar being the same as the model calendar. The forcing
for a given model year would be the forcing of the same year. This
would be appropriate in transient runs where the model calendar is
setup to span the same year range as the forcing data.
</desc>
</entry>

<entry id="DATM_CPLHIST_YR_START">
<type>integer</type>
<valid_values></valid_values>
<default_value>-999</default_value>
<group>run_component_datm</group>
<file>env_run.xml</file>
<desc>starting year to loop data over (only used when DATM_MODE is CPLHIST)</desc>
</entry>

<entry id="DATM_CPLHIST_YR_END">
<type>integer</type>
<valid_values></valid_values>
<default_value>-999</default_value>
<group>run_component_datm</group>
<file>env_run.xml</file>
<desc>ending year to loop data over (only used when DATM_MODE is CPLHIST)</desc>
</entry>

<entry id="DATM_CLMNCEP_YR_ALIGN">
<entry id="DATM_YR_ALIGN">
<type>integer</type>
<valid_values></valid_values>
<default_value>1</default_value>
Expand All @@ -209,26 +170,38 @@
<value compset="HIST.*_DATM%QIA">1895</value>
<value compset="HIST.*_DATM%CRU">1901</value>
<value compset="HIST.*_DATM%GSW">1901</value>
<value compset="HIST.*_DATM%NLDAS2">$DATM_CLMNCEP_YR_START</value>
<value compset="HIST.*_DATM%NLDAS2">$DATM_YR_START</value>
<value compset="20TR.*_DATM%QIA">1895</value>
<value compset="20TR.*_DATM%CRU">1901</value>
<value compset="20TR.*_DATM%GSW">1901</value>
<value compset="SSP.*_DATM%QIA">$DATM_CLMNCEP_YR_START</value>
<value compset="SSP.*_DATM%CRU">$DATM_CLMNCEP_YR_START</value>
<value compset="SSP.*_DATM%GSW">$DATM_CLMNCEP_YR_START</value>
<value compset="SSP.*_DATM%QIA">$DATM_YR_START</value>
<value compset="SSP.*_DATM%CRU">$DATM_YR_START</value>
<value compset="SSP.*_DATM%GSW">$DATM_YR_START</value>
<value compset="1850.*_DATM%CRU">1</value>
<value compset="1850.*_DATM%GSW">1</value>
<value compset="2000.*_DATM">$DATM_CLMNCEP_YR_START</value>
<value compset="2003.*_DATM">$DATM_CLMNCEP_YR_START</value>
<value compset="2010.*_DATM">$DATM_CLMNCEP_YR_START</value>
<value compset="4804.*_DATM">$DATM_CLMNCEP_YR_START</value>
<value compset="2000.*_DATM">$DATM_YR_START</value>
<value compset="2003.*_DATM">$DATM_YR_START</value>
<value compset="2010.*_DATM">$DATM_YR_START</value>
<value compset="4804.*_DATM">$DATM_YR_START</value>
</values>
<group>run_component_datm</group>
<file>env_run.xml</file>
<desc>year align</desc>
<desc>
Simulation year corresponding to DATM_YR_START. A common usage
is to set this to RUN_STARTDATE. With this setting, the forcing
in the first year of the run will be the forcing of year
DATM_YR_START. Another use case is to align the calendar
of transient forcing with the model calendar. For example,
setting DATM_YR_ALIGN=DATM_YR_START will lead to
the forcing calendar being the same as the model calendar. The
forcing for a given model year would be the forcing of the same
year. This would be appropriate in transient runs where the
model calendar is setup to span the same year range as the
forcing data.
</desc>
</entry>

<entry id="DATM_CLMNCEP_YR_START">
<entry id="DATM_YR_START">
<type>integer</type>
<valid_values></valid_values>
<default_value>2004</default_value>
Expand Down Expand Up @@ -270,7 +243,7 @@
<desc>starting year to loop data over</desc>
</entry>

<entry id="DATM_CLMNCEP_YR_END">
<entry id="DATM_YR_END">
<type>integer</type>
<valid_values></valid_values>
<default_value>2004</default_value>
Expand Down
12 changes: 6 additions & 6 deletions datm/cime_config/namelist_definition_datm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@
</desc>
<values>
<value>$ATM_DOMAIN_MESH</value>
<value scol_mode='true'>null</value>
<value create_mesh='true'>null</value>
<value mode='scol'>null</value>
<value mode='create_mesh'>null</value>
</values>
</entry>

Expand All @@ -148,8 +148,8 @@
</desc>
<values>
<value>$ATM_DOMAIN_MESH</value>
<value scol_mode='true'>$ATM_DOMAIN_PATH/$ATM_DOMAIN_FILE</value>
<value create_mesh='true'>$ATM_DOMAIN_PATH/$ATM_DOMAIN_FILE</value>
<value mode='scol'>$ATM_DOMAIN_PATH/$ATM_DOMAIN_FILE</value>
<value mode='create_mesh'>$ATM_DOMAIN_PATH/$ATM_DOMAIN_FILE</value>
</values>
</entry>

Expand All @@ -163,8 +163,8 @@
</desc>
<values>
<value>null</value>
<value scol_mode='true'>$ATM_DOMAIN_PATH/$ATM_DOMAIN_FILE</value>
<value create_mesh='true'>$ATM_DOMAIN_PATH/$ATM_DOMAIN_FILE</value>
<value mode='scol'>$ATM_DOMAIN_PATH/$ATM_DOMAIN_FILE</value>
<value mode='create_mesh'>$ATM_DOMAIN_PATH/$ATM_DOMAIN_FILE</value>
</values>
</entry>

Expand Down
Loading