Skip to content

Update CMEPS to latest ESCOMP/CMEPS master #36

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
DeniseWorthen merged 62 commits into from
Apr 9, 2021
Merged

Update CMEPS to latest ESCOMP/CMEPS master #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
5693a83
bug fixes for aux_cam test suite
Jan 20, 2021
e8f967e
changes to get aux_cam test suite working
Jan 27, 2021
2729830
fixed problems for cart3d mapping and made it the default for cesm
Feb 1, 2021
cb1ccac
Merge remote-tracking branch 'origin/master' into mvertens/bugfixes_a…
Feb 1, 2021
1c49a4b
updated testlist_drv.xml
Feb 2, 2021
4960f5f
removed hard coding of cnumber
Feb 2, 2021
1a31e0d
removed DEBUG comments
Feb 2, 2021
c4acaa8
Merge pull request #157 from ESCOMP/mvertens/bugfixes_auxcam
jedwards4b Feb 4, 2021
e18514b
update internal PIO initialization
Feb 14, 2021
2a1977a
more work related to component level PIO initialization
Feb 16, 2021
7770513
add missing ESMF call to use statement
Feb 18, 2021
6e36233
remove shr_pio_mod.F90 from util/CMakeLists.txt
Feb 18, 2021
42c82d7
fix for performance issue in S2S
Feb 23, 2021
21b2d86
change default for pio_root
Feb 23, 2021
dced80b
remove extra print
Feb 23, 2021
48b9136
add extra print
Feb 23, 2021
216ab10
add support to set pio debug level and set uninitialized variable
Feb 26, 2021
3f9de91
minor fix for CDEPS data ocean
Feb 26, 2021
d245094
use pts_lat and pts_lon for single point cases
jedwards4b Feb 26, 2021
8b29011
remove PTS_MODE variable, use domain file
jedwards4b Mar 1, 2021
74f7751
Merge pull request #158 from hafs-community/feature/pio_fix_comp
uturuncoglu Mar 5, 2021
b7e7806
changes for single column mode
Mar 9, 2021
6ffb9f1
Updated land-sea mask used for CFSR or GEFS data.
binli2337 Mar 9, 2021
0fb97b0
Merge remote-tracking branch 'escomp/master' into HEAD
DeniseWorthen Mar 10, 2021
0501d0b
Merge remote-tracking branch 'BinLi/feature/new_mask' into HEAD
DeniseWorthen Mar 10, 2021
0dccdad
changes to get scol working
Mar 12, 2021
6cb0454
changes to get nag 6.2 compiler working
jedwards4b Mar 10, 2021
bd53936
initialize rc
jedwards4b Mar 11, 2021
e37038d
correct grid for nuopc
jedwards4b Mar 12, 2021
cd0e922
added attribute for scol_spval for single column checks to be consist…
Mar 14, 2021
f3e2564
Merge remote-tracking branch 'jim/nag_port' into mvertens/scol
Mar 14, 2021
756c7f7
Merge pull request #163 from jedwards4b/nag_port
jedwards4b Mar 15, 2021
4015c83
Merge remote-tracking branch 'origin/master' into mvertens/scol
Mar 15, 2021
6c13813
update esmf version in github action
jedwards4b Mar 16, 2021
d8c48c6
update pio version
jedwards4b Mar 16, 2021
bf16a6b
fixed comments in PR
Mar 16, 2021
839e294
add bumpversion action
jedwards4b Mar 16, 2021
6f9d730
merge to head
jedwards4b Mar 16, 2021
76b839b
Merge pull request #164 from ESCOMP/mvertens/scol
jedwards4b Mar 16, 2021
b4d2b19
compilation bug fixes
Mar 17, 2021
815f2b4
Merge pull request #165 from ESCOMP/mvertens/driver_bugfix
jedwards4b Mar 17, 2021
ad849ec
pr to impliment automatic versioning in cmeps repo
jedwards4b Mar 17, 2021
1627da9
Merge pull request #166 from jedwards4b/version_bump_pr
jedwards4b Mar 17, 2021
014c223
changes to get ctsm LILAC mode to work
Mar 19, 2021
ad106b0
Merge pull request #167 from ESCOMP/mvertens/bugfix_lilac
jedwards4b Mar 19, 2021
92df294
addition of bilnr_cart3d mapping
Mar 21, 2021
04b8b08
removed extraneous comment
Mar 22, 2021
aa86626
update datm dependence of srcMaskValue
DeniseWorthen Mar 22, 2021
1a32ab7
Merge pull request #168 from ESCOMP/mvertens/bilnr_cart3d
jedwards4b Mar 22, 2021
4fe2fbc
Merge remote-tracking branch 'escomp/master' into feature/dstmapbilnPR
DeniseWorthen Mar 24, 2021
f1e9507
clean branch for dststatus and mapbilnr_nstod
DeniseWorthen Mar 24, 2021
02ceba3
add missing dststatusfield for mappatch and mappatch_uv3d
DeniseWorthen Mar 24, 2021
9a0cad5
optionally read dststatus_print from MED_attributes
DeniseWorthen Mar 24, 2021
c6a10fd
clean up comment
DeniseWorthen Mar 24, 2021
8522323
Remove valid_values for GLC_GRID
billsacks Mar 24, 2021
dd1af1f
Merge pull request #170 from billsacks/glc_grid
mvertens Mar 26, 2021
b437148
update for getting the glc present flag set correctly with nag compiler
Mar 27, 2021
33b10f0
Merge pull request #172 from ESCOMP/mvertens/cesm_bugfix
mvertens Mar 27, 2021
df76314
Merge pull request #169 from DeniseWorthen/feature/dstmapbilnPR
mvertens Mar 28, 2021
994fc56
Merge remote-tracking branch 'escomp/master' into feature/updcmeps
DeniseWorthen Mar 28, 2021
4556f5e
revert change srcMaskValue
DeniseWorthen Mar 28, 2021
d5b270c
Merge branch 'emc/develop' into feature/updcmeps
DeniseWorthen Apr 5, 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
20 changes: 20 additions & 0 deletions .github/workflows/bumpversion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Bump version
on:
push:
branches:
- master
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: '0'
- name: Bump version and push tag
uses: anothrNick/github-tag-action@1.26.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
WITH_V: true
DEFAULT_BUMP: minor
RELEASE_BRANCHES: master
DRY_RUN: False
6 changes: 3 additions & 3 deletions .github/workflows/extbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ jobs:
CXX: mpicxx
CPPFLAGS: "-I/usr/include -I/usr/local/include"
# Versions of all dependencies can be updated here
ESMF_VERSION: ESMF_8_1_0_beta_snapshot_41
ESMF_VERSION: ESMF_8_1_0_beta_snapshot_47
PNETCDF_VERSION: pnetcdf-1.12.2
NETCDF_FORTRAN_VERSION: v4.5.2
# PIO version is awkward
PIO_VERSION_DIR: pio2_5_2
PIO_VERSION: pio-2.5.2
PIO_VERSION_DIR: pio2_5_3
PIO_VERSION: pio-2.5.3
Copy link
Copy Markdown
Collaborator

@junwang-noaa junwang-noaa Apr 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am curious where this pio-2.5.3 is installed?

Copy link
Copy Markdown
Collaborator Author

@DeniseWorthen DeniseWorthen Apr 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't this refer just to the github actions that is set up on the ESCOMP repo for their PRs?

Copy link
Copy Markdown
Collaborator

@junwang-noaa junwang-noaa Apr 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, it is running a standalone build job, the pio used there is different, I guess it is OK.

steps:
- uses: actions/checkout@v2
# Build the ESMF library, if the cache contains a previous build
Expand Down
13 changes: 10 additions & 3 deletions cime_config/buildnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,21 @@ def _create_drv_namelists(case, infile, confdir, nmlgen, files):
config['MPILIB'] = case.get_value('MPILIB')
config['OS'] = case.get_value('OS')
config['glc_nec'] = 0 if case.get_value('GLC_NEC') == 0 else case.get_value('GLC_NEC')
config['single_column'] = 'true' if case.get_value('PTS_MODE') else 'false'
config['timer_level'] = 'pos' if case.get_value('TIMER_LEVEL') >= 1 else 'neg'
config['bfbflag'] = 'on' if case.get_value('BFBFLAG') else 'off'
config['continue_run'] = '.true.' if case.get_value('CONTINUE_RUN') else '.false.'
config['flux_epbal'] = 'ocn' if case.get_value('CPL_EPBAL') == 'ocn' else 'off'
config['atm_grid'] = case.get_value('ATM_GRID')
config['mask_grid'] = case.get_value('MASK_GRID')

# determine if need to set atm_domainfile
scol_lon = float(case.get_value('PTS_LON'))
scol_lat = float(case.get_value('PTS_LAT'))
if scol_lon > -999. and scol_lat > -999. and case.get_value("ATM_DOMAIN_FILE") != "UNSET":
config['single_column'] = 'true'
else:
config['single_column'] = 'false'

# needed for determining the run sequence as well as glc_renormalize_smb
config['COMP_ATM'] = case.get_value("COMP_ATM")
config['COMP_ICE'] = case.get_value("COMP_ICE")
Expand Down Expand Up @@ -258,13 +265,13 @@ def _create_drv_namelists(case, infile, confdir, nmlgen, files):
# skip the mediator if there is a prognostic component and all other components are stub
valid_comps.remove("CPL")
nmlgen.set_value('mediator_present', value='.false.')
nmlgen.set_value("drv_restart_pointer", value="none")
nmlgen.set_value("component_list", value=" ".join(valid_comps))
else:
# do not skip mediator if there is a data component but all other components are stub
nmlgen.set_value("drv_restart_pointer", value="rpointer.cpl")
valid_comps_string = " ".join(valid_comps)
nmlgen.set_value("component_list", value=valid_comps_string.replace("CPL","MED"))
# the driver restart pointer will look like a mediator is present even if it is not
nmlgen.set_value("drv_restart_pointer", value="rpointer.cpl")

logger.info("Writing nuopc_runseq for components {}".format(valid_comps))
nuopc_config_file = os.path.join(confdir, "nuopc.runconfig")
Expand Down
128 changes: 22 additions & 106 deletions cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,8 +1177,7 @@

<entry id="GLC_GRID">
<type>char</type>
<valid_values>gland20,gland10,gland5,gland5UM,gland4,mpas.gis20km,mpas.ais20km,null</valid_values>
<default_value>gland5UM</default_value>
<default_value>UNSET</default_value>
<group>build_grid</group>
<file>env_build.xml</file>
<desc>glacier (glc) grid - DO NOT EDIT (for experts only)</desc>
Expand Down Expand Up @@ -1233,57 +1232,42 @@
<desc>grid mask - DO NOT EDIT (for experts only)</desc>
</entry>

<entry id="PTS_MODE">
<type>logical</type>
<valid_values>TRUE,FALSE</valid_values>
<default_value>FALSE</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>Operate on only a single point of the global grid - DO NOT EDIT (for experts only)</desc>
</entry>

<entry id="PTS_LAT">
<type>real</type>
<default_value>-999.99</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>Latitude to find nearest points for points mode (only used if PTS_MODE is TRUE)</desc>
<desc>Latitude of grid location, in single column mode interpolate datasets to this location
in single point mode assume all datasets are at this location</desc>
</entry>

<entry id="PTS_LON">
<type>real</type>
<default_value>-999.99</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>Longitude to find nearest points for points mode (only used if PTS_MODE is TRUE)</desc>
<desc>Longitude of grid location, in single column mode interpolate datasets to this location
in single point mode assume all datasets are at this location</desc>
</entry>

<!-- ======================================================================= -->
<!-- DOMAIN FILES (drv) -->
<!-- ======================================================================= -->

<entry id="ATM_DOMAIN_FILE">
<entry id="PTS_DOMAINFILE">
<type>char</type>
<default_value>UNSET</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>atm domain file</desc>
</entry>
<entry id="ATM_DOMAIN_PATH">
<type>char</type>
<default_value>$DIN_LOC_ROOT/share/domains</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>path of atm domain file</desc>
</entry>
<entry id="ATM_DOMAIN_MESH">
<type>char</type>
<default_value>UNSET</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>atm mesh file (full pathname)</desc>
<desc>used only if if PTS_LAT and PTS_LON are greater than or
equal to 0. If this is the case then if PTS_DOMAINFILE is not
equal to UNSET a nearest neighbor search of PTS_DOMAINFILE using
PTS_LAT and PTS_LON will be done and the component mesh will have
this nearest neighbor value. </desc>
</entry>

<!-- ======================================================================= -->
<!-- DOMAIN FILES (drv) -->
<!-- ======================================================================= -->

<!-- NOTE: the following two entries are only needed because the CTSM LILAC build still -->
<!-- uses fatmlndfrc and that is obtained from the following xml variables -->
<entry id="LND_DOMAIN_FILE">
<type>char</type>
<default_value>UNSET</default_value>
Expand All @@ -1298,27 +1282,20 @@
<file>env_run.xml</file>
<desc>path of lnd domain file</desc>
</entry>
<entry id="LND_DOMAIN_MESH">
<type>char</type>
<default_value>UNSET</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>lnd mesh file (full pathname)</desc>
</entry>

<entry id="ROF_DOMAIN_FILE">
<entry id="ATM_DOMAIN_MESH">
<type>char</type>
<default_value>UNSET</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>rof domain file</desc>
<desc>atm mesh file (full pathname)</desc>
</entry>
<entry id="ROF_DOMAIN_PATH">
<entry id="LND_DOMAIN_MESH">
<type>char</type>
<default_value>$DIN_LOC_ROOT/share/domains</default_value>
<default_value>UNSET</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>path of rof domain file</desc>
<desc>lnd mesh file (full pathname)</desc>
</entry>
<entry id="ROF_DOMAIN_MESH">
<type>char</type>
Expand All @@ -1327,95 +1304,34 @@
<file>env_run.xml</file>
<desc>rof mesh file (full pathname)</desc>
</entry>

<entry id="WAV_DOMAIN_FILE">
<type>char</type>
<default_value>UNSET</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>wav domain file</desc>
</entry>
<entry id="WAV_DOMAIN_PATH">
<type>char</type>
<default_value>$DIN_LOC_ROOT/share/domains</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>path of wav domain file</desc>
</entry>
<entry id="WAV_DOMAIN_MESH">
<type>char</type>
<default_value>UNSET</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>wav mesh file (full pathname)</desc>
</entry>

<entry id="ICE_DOMAIN_FILE">
<type>char</type>
<default_value>UNSET</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>ice domain file</desc>
</entry>
<entry id="ICE_DOMAIN_PATH">
<type>char</type>
<default_value>$DIN_LOC_ROOT/share/domains</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>path of ice domain file</desc>
</entry>
<entry id="ICE_DOMAIN_MESH">
<type>char</type>
<default_value>UNSET</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>ice mesh file (full pahtname)</desc>
</entry>

<entry id="OCN_DOMAIN_FILE">
<type>char</type>
<default_value>UNSET</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>ocn domain file</desc>
</entry>
<entry id="OCN_DOMAIN_PATH">
<type>char</type>
<default_value>$DIN_LOC_ROOT/share/domains</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>path of ocn domain file</desc>
</entry>
<entry id="OCN_DOMAIN_MESH">
<type>char</type>
<default_value>UNSET</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>ocn mesh file (full pathname)</desc>
</entry>

<entry id="GLC_DOMAIN_FILE">
<type>char</type>
<default_value>UNSET</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>glc domain file</desc>
</entry>
<entry id="GLC_DOMAIN_PATH">
<type>char</type>
<default_value>$DIN_LOC_ROOT/share/domains</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>path of glc domain file</desc>
</entry>
<entry id="GLC_DOMAIN_MESH">
<type>char</type>
<default_value>UNSET</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>glc mesh file (full pathname)</desc>
</entry>

<entry id="MASK_MESH">
<type>char</type>
<default_value>UNSET</default_value>
Expand Down
69 changes: 40 additions & 29 deletions cime_config/config_component_cesm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,35 +205,46 @@
<value compset="_DATM.*_CLM">48</value>
<!-- NOTE: if the following is changed from 24 -> 4 - then a new run sequence is needed since the -->
<!-- ocn coupling interval for this case is 24 - but the atm is longer -->
<value compset="_DATM.*_SLND.*_DICE.*_POP2" >24</value>
<value compset="_DATM.*_SLND.*_DICE.*_MOM6" >24</value>
<value compset="_DATM.*_SLND.*_CICE.*_POP2" >24</value>
<value compset="_DATM.*_SLND.*_CICE.*_MOM6" >24</value>
<value compset="_DATM.*_CICE.*_DOCN" >24</value>
<value compset="_DATM.*_DOCN%US20" >24</value>
<value compset="_DATM%CPLHIST.+POP\d" >48</value>
<value compset="_DATM%CPLHIST.+MOM\d" >48</value>
<value compset="_MPAS" >1</value>
<value compset=".+" grid="a%0.23x0.31" >96</value>
<value compset=".+" grid="a%ne60np4" >96</value>
<value compset=".+" grid="a%ne60np4.pg3" >96</value>
<value compset=".+" grid="a%ne60np4.pg4" >96</value>
<value compset=".+" grid="a%ne120np4" >192</value>
<value compset=".+" grid="a%ne120np4.pg2" >192</value>
<value compset=".+" grid="a%ne120np4.pg3" >192</value>
<value compset=".+" grid="a%ne120np4.pg4" >192</value>
<value compset=".+" grid="a%ne240np4" >384</value>
<value compset=".+" grid="a%ne240np4.pg2" >384</value>
<value compset=".+" grid="a%ne240np4.pg3" >384</value>
<value compset=".+" grid="a%ne0np4CONUS.ne30x8" >144</value>
<value compset=".+" grid="a%T42" >72</value>
<value compset=".+" grid="a%T85" >144</value>
<value compset=".+" grid="a%T341" >288</value>
<value compset=".+" grid="1x1" >48</value>
<value compset=".+" grid="1x1_urbanc" >48</value>
<value compset=".+" grid="1x1_mexico" >24</value>
<value compset=".+" grid="1x1_vancou" >24</value>
<value compset="_DLND.*_CISM\d" >1</value>
<value compset="_DATM.*_SLND.*_DICE.*_POP2" >24</value>
<value compset="_DATM.*_SLND.*_DICE.*_MOM6" >24</value>
<value compset="_DATM.*_SLND.*_CICE.*_POP2" >24</value>
<value compset="_DATM.*_SLND.*_CICE.*_MOM6" >24</value>
<!-- <value compset="_DATM.*_DICE.*_POP2.*_WW3" >4</value> -->
<!-- <value compset="_DATM.*_DICE.*_MOM6.*_WW3" >4</value> -->
<!-- <value compset="_DATM.*_DICE.*_POP2.*_DWAV" >4</value> -->
<!-- <value compset="_DATM.*_DICE.*_MOM6.*_DWAV" >4</value> -->
<value compset="_DATM.*_CICE.*_DOCN" >24</value>
<value compset="_DATM.*_DOCN%US20" >24</value>
<value compset="_DATM%CPLHIST.+POP\d" >48</value>
<value compset="_DATM%CPLHIST.+MOM\d" >48</value>
<value compset="_MPAS" >1</value>
<value compset=".+" grid="a%0.23x0.31" >96</value>
<value compset=".+" grid="a%ne60np4" >96</value>
<value compset=".+" grid="a%ne60np4.pg3" >96</value>
<value compset=".+" grid="a%ne60np4.pg4" >96</value>
<value compset=".+" grid="a%ne120np4" >192</value>
<value compset=".+" grid="a%ne120np4.pg2" >192</value>
<value compset=".+" grid="a%ne120np4.pg3" >192</value>
<value compset=".+" grid="a%ne120np4.pg4" >192</value>
<value compset=".+" grid="a%ne240np4" >384</value>
<value compset=".+" grid="a%ne240np4.pg2" >384</value>
<value compset=".+" grid="a%ne240np4.pg3" >384</value>
<value compset=".+" grid="a%ne0np4CONUS.ne30x8" >384</value>
<value compset=".+" grid="a%ne0np4.ARCTIC.ne30x4" >192</value>
<value compset=".+" grid="a%ne0np4.ARCTICGRIS.ne30x8" >384</value>
<value compset=".+" grid="a%C24" >48</value>
<value compset=".+" grid="a%C48" >48</value>
<value compset=".+" grid="a%C96" >48</value>
<value compset=".+" grid="a%C192" >96</value>
<value compset=".+" grid="a%C384" >192</value>
<value compset=".+" grid="a%T42" >72</value>
<value compset=".+" grid="a%T85" >144</value>
<value compset=".+" grid="a%T341" >288</value>
<value compset=".+" grid="1x1" >48</value>
<value compset=".+" grid="1x1_urbanc" >48</value>
<value compset=".+" grid="1x1_mexico" >24</value>
<value compset=".+" grid="1x1_vancou" >24</value>
<value compset="_DLND.*_CISM\d" >1</value>
<!-- <value compset="_DATM.*_DICE.*_POP2.*_WW3">4</value> -->
<!-- <value compset="_DATM.*_DICE.*_POP2.*_DWAV">4</value> -->
</values>
Expand Down
Loading