Skip to content

Sync with ESCOMP/master to bring component level PIO initialization #2

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

Closed
uturuncoglu wants to merge 19 commits into from
Closed

Sync with ESCOMP/master to bring component level PIO initialization #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
18d1db2
Merge branch 'master' into HEAD
Jan 25, 2021
983ae46
Merge commit '18d1db2'
Jan 25, 2021
a843433
fixed bug if scripts_regression_test
Jan 25, 2021
63fd3d5
Merge pull request #47 from ESCOMP/mvertens/bugfix
jedwards4b Jan 25, 2021
8c6b1ac
replace datm_clmncep_yr and datm_cplhist_yr with datm_yr
jedwards4b Feb 1, 2021
f36b2fe
namelist cleanup
jedwards4b Feb 1, 2021
bcd7efe
replace musgs with mg37 in cdeps tests
jedwards4b Feb 1, 2021
5db7611
Merge pull request #48 from jedwards4b/update_testlist
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
1f02a73
Merge pull request #49 from jedwards4b/jedwards/namelist_cleanup
jedwards4b Feb 4, 2021
bd6b3e6
enable component level PIO initialization
Feb 18, 2021
690592a
shr_pio_mod needs to be used only with CESM
Feb 18, 2021
f6b00c6
fix for inline data components and CESM tests
Feb 19, 2021
ee0aa4c
change pio defaults and clean print statements
Feb 23, 2021
92b08b8
add support to set pio debug level
Feb 26, 2021
d5fe83d
Merge branch 'master' into feature/pio_fix_comp
uturuncoglu Feb 26, 2021
378028e
Merge pull request #52 from hafs-community/feature/pio_fix_comp
uturuncoglu Feb 27, 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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if (DEFINED CIMEROOT)
set(CMAKE_Fortran_COMPILER ${MPIFC})
set(CMAKE_CXX_COMPILER ${MPICXX})
endif()
set(CMAKE_Fortran_FLAGS "${FFLAGS} -I${LIBROOT}/include -I${LIBROOT}/finclude -I${LIBROOT}/nuopc/esmf/${NINST_VALUE}/include")
set(CMAKE_Fortran_FLAGS "${FFLAGS} ${CPPDEFS} -I${LIBROOT}/include -I${LIBROOT}/finclude -I${LIBROOT}/nuopc/esmf/${NINST_VALUE}/include")
else()
set(BLD_STANDALONE TRUE)
endif()
Expand Down
14 changes: 7 additions & 7 deletions cime_config/testdefs/testlist_cdeps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
<?xml version="1.0"?>
<testlist version="2.0">

<test compset="2000_DATM%QIA_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_musgs" name="SMS_Vnuopc_Ld5">
<test compset="2000_DATM%QIA_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Vnuopc_Ld5">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_cdeps"/>
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="2000_DATM%CRUv7_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_musgs" name="SMS_Vnuopc_Ld5">
<test compset="2000_DATM%CRUv7_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Vnuopc_Ld5">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_cdeps"/>
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="HIST_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_musgs" name="SMS_Vnuopc_Ld5">
<test compset="HIST_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Vnuopc_Ld5">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_cdeps"/>
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="1850_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_musgs" name="SMS_Vnuopc_Ld5">
<test compset="1850_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Vnuopc_Ld5">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_cdeps"/>
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="2010_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_musgs" name="SMS_Vnuopc_Ld5">
<test compset="2010_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Vnuopc_Ld5">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_cdeps"/>
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="SSP585_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_musgs" name="SMS_Vnuopc_Ld5">
<test compset="SSP585_DATM%GSWP3v1_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Vnuopc_Ld5">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_cdeps"/>
</machines>
<options>
<option name="wallclock"> 00:10:00 </option>
</options>
</test>
<test compset="2000_DATM%NLDAS2_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_musgs" name="SMS_Vnuopc_Ld5">
<test compset="2000_DATM%NLDAS2_SLND_SICE_SOCN_SROF_SGLC_SWAV_SESP" grid="f10_f10_mg37" name="SMS_Vnuopc_Ld5">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_cdeps"/>
</machines>
Expand Down
4 changes: 2 additions & 2 deletions datm/atm_comp_nuopc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)

! Obtain flds_scalar values, mpi values, multi-instance values and
! set logunit and set shr logging to my log file
call dshr_init(gcomp, mpicom, my_task, inst_index, inst_suffix, &
call dshr_init(gcomp, 'ATM', sdat, mpicom, my_task, inst_index, inst_suffix, &
flds_scalar_name, flds_scalar_num, flds_scalar_index_nx, flds_scalar_index_ny, &
logunit, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
Expand Down Expand Up @@ -366,7 +366,7 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)

! Initialize mesh, restart flag, compid, and logunit
call ESMF_TraceRegionEnter('datm_strdata_init')
call dshr_mesh_init(gcomp, nullstr, logunit, 'ATM', nx_global, ny_global, &
call dshr_mesh_init(gcomp, sdat, nullstr, logunit, 'ATM', nx_global, ny_global, &
model_meshfile, model_maskfile, model_createmesh_fromfile, model_mesh, &
model_mask, model_frac, restart_read, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
Expand Down
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