Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
257 commits
Select commit Hold shift + click to select a range
44549e5
add test for ERA5
uturuncoglu Jul 28, 2020
6ac93fa
put extra log if it cannot find the field in the state
uturuncoglu Jul 29, 2020
067293e
Merge pull request #7 from ESCOMP/update_era5_v2
uturuncoglu Jul 29, 2020
5f9a655
bug fixes
Jul 30, 2020
317c8ae
first changes for 3d input capability
Aug 1, 2020
13a2708
updates to have DLND compset working and bfb
Aug 2, 2020
e7b4958
fix for fldptr return mode
uturuncoglu Aug 4, 2020
f5fef94
Merge pull request #10 from ESCOMP/fix_fldptr
uturuncoglu Aug 4, 2020
cb47276
addition of 3d functionality
Aug 5, 2020
6ed43c2
add fox as a submodule of cdeps
jedwards4b Aug 6, 2020
4f5499d
cleanup
Aug 6, 2020
54b6bb7
Merge branch 'master' into feature/bug_fixes
Aug 6, 2020
1c6624d
add fox submodule
jedwards4b Aug 6, 2020
fac382c
remove more t_barriers
jedwards4b Aug 6, 2020
13676a2
Merge pull request #12 from jedwards4b/add_fox_submodule
jedwards4b Aug 6, 2020
3bfc100
build fixes
jedwards4b Aug 7, 2020
a6a682a
update fox
jedwards4b Aug 7, 2020
7a0c37f
Create extbuild.yml
jedwards4b Aug 6, 2020
85f4ee2
untar pio
jedwards4b Aug 6, 2020
56784aa
no tabs allowed
jedwards4b Aug 6, 2020
17b9a45
add cdeps build
jedwards4b Aug 6, 2020
b355a68
try again
jedwards4b Aug 6, 2020
e4b1062
add esmf build
jedwards4b Aug 6, 2020
83c2a60
no tabs
jedwards4b Aug 6, 2020
dcc1d52
more workflow stuff
jedwards4b Aug 6, 2020
5759f6c
fix again
jedwards4b Aug 6, 2020
b2d5f3a
fix format
jedwards4b Aug 6, 2020
d17f05d
add :
jedwards4b Aug 6, 2020
f16271c
try again
jedwards4b Aug 6, 2020
6080602
try again
jedwards4b Aug 6, 2020
b2977c9
try again
jedwards4b Aug 6, 2020
e7581b9
try again
jedwards4b Aug 6, 2020
908f61d
redo esmf build
jedwards4b Aug 7, 2020
ba35a4b
redo esmf build
jedwards4b Aug 7, 2020
07c0ba9
redo esmf build
jedwards4b Aug 7, 2020
69683b9
put it together
jedwards4b Aug 7, 2020
4969e1d
tabs again
jedwards4b Aug 7, 2020
7eb7169
whitespace cleanup
jedwards4b Aug 7, 2020
b0fc9fe
reindent and try again
jedwards4b Aug 7, 2020
dd647f0
try a smaller piece
jedwards4b Aug 7, 2020
c47d196
fix indentation issues
jedwards4b Aug 7, 2020
516e500
more indentation issues
jedwards4b Aug 7, 2020
32cb41d
update fox cmake defaults
jedwards4b Aug 7, 2020
968b57c
try again
jedwards4b Aug 7, 2020
cda2c88
getting closer
jedwards4b Aug 7, 2020
c561e94
add pio build
jedwards4b Aug 7, 2020
3f972b8
add pnetcdf path
jedwards4b Aug 7, 2020
5daac89
add netcdf-fortran
jedwards4b Aug 7, 2020
08c67e9
fix syntax error
jedwards4b Aug 7, 2020
973bd40
find netcdf version
jedwards4b Aug 7, 2020
5195033
need netcdf-fortran 4.5.2
jedwards4b Aug 7, 2020
e6dc151
remove debug statement
jedwards4b Aug 7, 2020
b34d98d
another typo fixed
jedwards4b Aug 7, 2020
b116576
debug commit
jedwards4b Aug 7, 2020
88462dd
debug commit
jedwards4b Aug 7, 2020
34e4cea
update paths
jedwards4b Aug 7, 2020
981487d
restoring caches
jedwards4b Aug 7, 2020
dd95f0f
restoring caches
jedwards4b Aug 7, 2020
31e6767
add outputs
jedwards4b Aug 7, 2020
febee8e
add outputs
jedwards4b Aug 7, 2020
18294ea
add outputs
jedwards4b Aug 7, 2020
9d75383
Revert "add outputs"
jedwards4b Aug 7, 2020
59f7047
add outputs
jedwards4b Aug 7, 2020
d4bfc92
add outputs
jedwards4b Aug 7, 2020
e4aeaf9
one job?
jedwards4b Aug 7, 2020
9d8a59a
try again
jedwards4b Aug 7, 2020
654d660
now build cdeps
jedwards4b Aug 7, 2020
e937028
now build cdeps
jedwards4b Aug 7, 2020
06acde9
now build cdeps
jedwards4b Aug 7, 2020
42bcb08
add build flags
jedwards4b Aug 7, 2020
f172b16
add build flags
jedwards4b Aug 7, 2020
8de2f8d
add build flags
jedwards4b Aug 7, 2020
73dec14
add build flags
jedwards4b Aug 7, 2020
f38484d
add build flags
jedwards4b Aug 7, 2020
fbb0e1e
fix a real error
jedwards4b Aug 7, 2020
2fa1125
Merge pull request #13 from ESCOMP/add-github-actions
jedwards4b Aug 7, 2020
28c0644
more bug fixes
Aug 8, 2020
3e483ac
updates to latest cdeps
Aug 8, 2020
bfa92e3
more bug fixes
Aug 8, 2020
bb79a7f
Merge branch 'master' into feature/bug_fixes
jedwards4b Aug 8, 2020
339112c
Merge pull request #15 from ESCOMP/feature/bug_fixes
jedwards4b Aug 8, 2020
d7b8a4c
remove unused variables
jedwards4b Aug 8, 2020
5a1b060
more cleanup
jedwards4b Aug 8, 2020
b1b2697
changes to get 3d stream input working
Aug 10, 2020
246644a
clean up wav comp
jedwards4b Aug 10, 2020
9d716f9
more cleanup
jedwards4b Aug 10, 2020
1245cfa
more cleanup
jedwards4b Aug 10, 2020
f2126a3
fix errors
jedwards4b Aug 10, 2020
13c94c7
fix error
jedwards4b Aug 10, 2020
994aaa8
fix error
jedwards4b Aug 10, 2020
abd5508
fix error
jedwards4b Aug 10, 2020
dc2c91f
fix error
jedwards4b Aug 10, 2020
b798586
fix error
jedwards4b Aug 10, 2020
3db6586
fix error
jedwards4b Aug 10, 2020
b4e99c9
fix errors
jedwards4b Aug 10, 2020
7de813a
more fixes
jedwards4b Aug 10, 2020
8d55901
fix another issue
jedwards4b Aug 10, 2020
7eb6ede
use ymd instead of date
jedwards4b Aug 10, 2020
08ea63c
use ymd instead of date
jedwards4b Aug 10, 2020
23fedf3
replace bias_correction
jedwards4b Aug 10, 2020
cac4613
make esmf version env var
jedwards4b Aug 10, 2020
a680ed4
add versions to dependencies
jedwards4b Aug 10, 2020
e1f555f
fix workflow error
jedwards4b Aug 10, 2020
7c65629
fix workflow
jedwards4b Aug 10, 2020
fc1a331
Merge pull request #16 from ESCOMP/minimize_compiler_warnings
jedwards4b Aug 10, 2020
18b1d3b
merge to cdeps master
Aug 11, 2020
6a35dea
updates for documentation
Aug 11, 2020
db0a90e
Merge branch 'master' of https://github.com/ESCOMP/CDEPS
Aug 11, 2020
8ed166f
udpates for PR requests
Aug 11, 2020
60a7486
Merge branch 'master' into mvertens/cdeps3d_works
jedwards4b Aug 11, 2020
cfc5345
Merge pull request #19 from ESCOMP/mvertens/cdeps3d_works
jedwards4b Aug 11, 2020
6f33826
new stream_definition_xxx.xml
Aug 15, 2020
2023267
changes to fix aux_cdeps tests and bring in stream_cdeps.py and strea…
Aug 19, 2020
45b7a85
fixed bugs
Aug 19, 2020
d808b7c
addressed PR issues raised by Jim Edwards
Aug 20, 2020
e99ec4f
Merge pull request #21 from ESCOMP/new_stream_schema
jedwards4b Aug 20, 2020
2480ebb
fix find compiler with cime
jedwards4b Aug 26, 2020
82a2974
improve the build, remove hardcoded path
jedwards4b Sep 18, 2020
b9a3fa8
Merge pull request #27 from ESCOMP/build_improvements
jedwards4b Sep 25, 2020
8508f59
build improvements
jedwards4b Sep 25, 2020
d4394fa
fixed bug in drof JRA55 specfication for mesh file
Oct 2, 2020
e9a9660
fix GPTL issue
Oct 12, 2020
977bfda
fix stdout format issue
jedwards4b Oct 30, 2020
2c2a2be
add code to avoid clashes when building multiple cases at once
jedwards4b Nov 16, 2020
a15b267
Merge branch 'master' of https://github.com/ESCOMP/CDEPS
jedwards4b Nov 16, 2020
dc6e3f6
increase wait time
jedwards4b Nov 16, 2020
8f0a405
simplify locking
jedwards4b Nov 16, 2020
6de6963
fix issue with CMAKE_INSTALL_PATH
jedwards4b Nov 17, 2020
3726ebb
cleanup;
jedwards4b Nov 17, 2020
3985a73
fix for pgi build
jedwards4b Nov 24, 2020
f9da2a6
feature/perf_updates
Dec 4, 2020
c669b39
Merge pull request #33 from ESCOMP/feature/perf_updates
jedwards4b Dec 7, 2020
3e6b717
fix for finding PIO
Dec 11, 2020
d94eeca
fix docn if the stream only provides SST
Dec 11, 2020
6f88a90
fixes to get datm working with dynamic fraction calculation in clm
Jan 4, 2021
b38ae62
changes to get docn working with dynamic fraction calculation if mask…
Jan 4, 2021
5808cb1
fix cmake build to work with HAFS
Jan 7, 2021
2cec07f
update cmake files for dice, dlnd, drof and dwav
Jan 8, 2021
47d9ec1
update dependencies
Jan 8, 2021
0831048
fixed problem for single point cases - no mapping file will be create…
Jan 10, 2021
1739751
fixed problems related to taxmode and dtlimit for DATM%PTCLM versus j…
Jan 10, 2021
f4bec30
finished adding datm_datamode_cplhist_mod.F90
Jan 10, 2021
dd2e5d2
changes to fix memory growth problem
Jan 11, 2021
a843a9b
Merge commit 'dd2e5d2' into mvertens/dynfrac
Jan 11, 2021
f286f51
removed debug write statement
Jan 11, 2021
e66fde4
updated missing stream mesh files
Jan 13, 2021
2e77890
fixed creation of ocean mask/frac when it needs to be created
Jan 14, 2021
c6be719
Merge branch 'master' into feature/hafs_cdeps_pr
uturuncoglu Jan 14, 2021
c39dc6a
add only clause i dshr_fldlist_mod and dshr_stream_mod
jedwards4b Jan 19, 2021
bf4f9da
add only to dshr_dfield_mod
jedwards4b Jan 19, 2021
1a5f6a1
add only clause to dshr_tinterp_mod
jedwards4b Jan 19, 2021
fc49812
add only to dshr_strdata_mod
jedwards4b Jan 19, 2021
92ec4b6
Merge pull request #41 from ESCOMP/mvertens/dynfrac
mvertens Jan 19, 2021
ee60a78
Merge branch 'master' into feature/hafs_cdeps_pr
uturuncoglu Jan 19, 2021
c64e7a2
add only clause to dshr_methods_mod
jedwards4b Jan 19, 2021
5374de6
add only clause
jedwards4b Jan 19, 2021
44b8864
add more only clauses
jedwards4b Jan 19, 2021
0ef2a44
add more only clauses
jedwards4b Jan 19, 2021
736766b
add more only clauses
jedwards4b Jan 19, 2021
63f1654
add more only clauses
jedwards4b Jan 19, 2021
64337ef
add more only clauses
jedwards4b Jan 19, 2021
4dc756e
add more only clauses
jedwards4b Jan 19, 2021
ca70972
add more only clauses
jedwards4b Jan 19, 2021
5393a13
Merge branch 'master' of https://github.com/ESCOMP/CDEPS into add_onl…
jedwards4b Jan 19, 2021
05458c0
more only clauses
jedwards4b Jan 19, 2021
bc84182
more only clauses
jedwards4b Jan 19, 2021
0b3a68e
Merge pull request #43 from jedwards4b/add_only_clause
jedwards4b Jan 19, 2021
1d8b5ce
fix make build under CESM
Jan 20, 2021
7cc6735
Merge branch 'master' into feature/hafs_cdeps_pr
uturuncoglu Jan 20, 2021
c138337
more fix for cmake build under CESM
Jan 20, 2021
5da53f4
fix the standalone build outside of any application
Jan 20, 2021
3b1ec5a
Merge pull request #40 from hafs-community/feature/hafs_cdeps_pr
uturuncoglu Jan 20, 2021
e077e7f
fix typo in cmake build
uturuncoglu Jan 22, 2021
6830f20
Merge pull request #46 from ESCOMP/fix_cmake_typo
jedwards4b Jan 22, 2021
447e1b6
Merge pull request #1 from ESCOMP/master
uturuncoglu Jan 22, 2021
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
2f11cb3
bugfixes for iradsw > 1
Feb 22, 2021
49ec807
updates to have SOMAQP working correctly
Feb 23, 2021
8517ebb
fixes for jra forcing for datm and drof
Mar 1, 2021
e4b9c55
updates for single column
Mar 9, 2021
e8c1d58
bug fixes
Mar 9, 2021
6fc0398
port to nag 6.1 fortran compiler
jedwards4b Feb 16, 2021
da0bd42
nag port
jedwards4b Feb 17, 2021
6ab7044
update include paths
jedwards4b Feb 17, 2021
b10ca28
ret should be int
jedwards4b Mar 11, 2021
4bbc650
nag port
jedwards4b Feb 17, 2021
fee300a
update include paths
jedwards4b Feb 17, 2021
76c5f04
avoid unassociated pointer
jedwards4b Mar 12, 2021
b476091
bug fixes to get single column working
Mar 12, 2021
81d24f4
replace 1x1 forcing data interpolation to bilinear from nn to be cons…
Mar 14, 2021
b91e418
Merge pull request #51 from jedwards4b/nag_port
jedwards4b Mar 15, 2021
7afec93
merge to master
Mar 15, 2021
6e89ecf
fix of argument type
Mar 16, 2021
7eedc05
removal of white space
Mar 16, 2021
87236b3
added new consistency checks for pts_lat and pts_lon
Mar 16, 2021
87b2464
fixed bug in buildnml
Mar 17, 2021
aef5362
clean up logic for single column not allowed
Mar 17, 2021
dc1b2a3
more bug fixes
Mar 17, 2021
0683261
add bumpversion to workflow
jedwards4b Mar 17, 2021
8c10dec
removed unnecessary rc check
Mar 19, 2021
65ee404
remove unneeded rc checks
jedwards4b Mar 19, 2021
ee28644
Merge pull request #54 from ESCOMP/mvertens/scol
jedwards4b Mar 19, 2021
ac51658
Merge branch 'master' into add_bump_version
jedwards4b Mar 19, 2021
6dcb4df
Merge pull request #56 from jedwards4b/add_bump_version
jedwards4b Mar 19, 2021
1954a46
add genf90 as a submodule
jedwards4b Mar 23, 2021
a7bd80d
point to genf90.pl in source
jedwards4b Mar 23, 2021
07003cd
update fox external for nag
jedwards4b Mar 24, 2021
b83be60
remove download of genf90
jedwards4b Mar 24, 2021
35c5650
Merge pull request #59 from jedwards4b/add_genf90_submodule
jedwards4b Mar 24, 2021
0961a16
Merge pull request #60 from jedwards4b/fox_nag_port
mvertens Mar 25, 2021
7eefcce
Point to new dlnd scpl forcing data
billsacks Mar 29, 2021
6fabb51
One more change needed to change years of data
billsacks Mar 30, 2021
48a26e6
Expand years in match for stream_datafiles pattern
billsacks Mar 30, 2021
9f54ef0
Merge pull request #61 from billsacks/dlnd_new_glc_forcings
billsacks Mar 30, 2021
77a2ec3
Fixes #63, two files were in NetCDF4 format and need a NetCDF5 versio…
ekluzek Mar 30, 2021
d8da129
Merge pull request #64 from ekluzek/cdf5files
mvertens Mar 31, 2021
e3179c7
changes for cmeps threading
jedwards4b Apr 2, 2021
5ac0ae1
Merge pull request #66 from jedwards4b/cmeps_threading
jedwards4b Apr 6, 2021
5be2b5b
merge pr #28
jedwards4b Apr 23, 2021
de677af
new neon station stream
jedwards4b Jan 20, 2021
8c52dd7
neon datm development
jedwards4b Feb 1, 2021
8098e8a
updates for neon
jedwards4b Feb 8, 2021
62b75ba
remove debug print
jedwards4b Feb 9, 2021
d0ce173
add tag action
jedwards4b Feb 9, 2021
1b7b865
rework NEON streams
jedwards4b Feb 19, 2021
2046a0a
superceeded workflow
jedwards4b Apr 12, 2021
06f47e0
remove debug print statement
jedwards4b Apr 16, 2021
6dc9e76
fix issue with double quotes
jedwards4b Apr 23, 2021
c177cd6
Merge ESCOMP/CDEPS to emc/develop branch.
binli2337 Apr 23, 2021
7817cf3
Remove fox and genf90.
binli2337 Apr 23, 2021
eceb024
Merge pull request #50 from jedwards4b/neon_streams
jedwards4b Apr 23, 2021
8d54951
Merge branch 'master' into feature/update11
binli2337 Apr 26, 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
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
14 changes: 9 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ if(BLD_STANDALONE)
list(APPEND EXTRA_LIBS cdeps_share)
list(APPEND EXTRA_INCLUDES "${CMAKE_BINARY_DIR}/share" )
endif()

if("${COMPILER}" STREQUAL "nag")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -D__NAG__")
endif()
add_subdirectory(fox)
add_subdirectory(streams)
add_subdirectory(dshr)
Expand Down Expand Up @@ -81,22 +83,24 @@ foreach(COMP datm dice dlnd docn drof dwav)
target_include_directories(${COMP} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/dshr>
$<INSTALL_INTERFACE:mod>)

install(TARGETS ${COMP}
install(TARGETS ${COMP}
EXPORT ${COMP}
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
COMPONENT Library)
install(EXPORT ${COMP}
install(EXPORT ${COMP}
DESTINATION lib/cmake)
endforeach(COMP)

foreach(DEPS streams dshr cdeps_share FoX_dom FoX_wxml FoX_sax FoX_common FoX_utils FoX_fsys)
if(NOT BLD_STANDALONE AND ${DEPS} STREQUAL "cdeps_share")
continue()
endif()
install(TARGETS ${DEPS}
install(TARGETS ${DEPS}
EXPORT ${DEPS}
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
COMPONENT Library)
install(EXPORT ${DEPS}
install(EXPORT ${DEPS}
DESTINATION lib/cmake)
endforeach(DEPS)
2 changes: 1 addition & 1 deletion cime_config/buildlib
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def buildlib(bldroot, libroot, case, compname=None):
expect(time_counter <= time_to_wait," Timeout waiting for {}".format(dwav_lib))
print("HERE exeroot {} bldroot {}".format(exe_root, bldroot))

s,o,e = run_cmd("make install DESTDIR={}".format(libroot), from_dir=bldroot, verbose=True)
s,o,e = run_cmd("make install VERBOSE=1 DESTDIR={}".format(libroot), from_dir=bldroot, verbose=True)
expect(not s,"ERROR from make output={}, error={}".format(o,e))

# Link the CDEPS component directories to the location expected by cime
Expand Down
28 changes: 15 additions & 13 deletions cime_config/stream_cdeps.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</stream_info>

"""

class StreamCDEPS(GenericXML):

def __init__(self, infile, schema):
Expand All @@ -64,8 +64,12 @@ def create_stream_xml(self, stream_names, case, streams_xml_file, data_list_file
stream_file.write('<file id="stream" version="2.0">\n')
# write contents of stream file
for stream_name in stream_names:
if stream_name:
self.stream_nodes = super(StreamCDEPS,self).get_child("stream_entry", {"name" : stream_name},
if stream_name.startswith("NEON."):
self.stream_nodes = super(StreamCDEPS,self).get_child("stream_entry", {"name" : "NEON.$NEONSITE"},
err_msg="No stream_entry {} found".format(stream_name))

elif stream_name:
self.stream_nodes = super(StreamCDEPS,self).get_child("stream_entry", {"name" : stream_name},
err_msg="No stream_entry {} found".format(stream_name))

# determine stream_year_first and stream_year_list
Expand Down Expand Up @@ -99,26 +103,26 @@ def create_stream_xml(self, stream_names, case, streams_xml_file, data_list_file
stream_datafiles = child.xml_element.text
stream_datafiles = self._resolve_values(case, stream_datafiles)
if 'first_year' in child.xml_element.attrib and 'last_year' in child.xml_element.attrib:
value = child.xml_element.get('first_year')
value = child.xml_element.get('first_year')
value = self._resolve_values(case, value)
stream_year_first= int(value)
value = child.xml_element.get('last_year')
value = child.xml_element.get('last_year')
value = self._resolve_values(case, value)
stream_year_last = int(value)
year_first = max(stream_year_first, data_year_first)
year_last = min(stream_year_last, data_year_last)
stream_datafiles = self._sub_paths(stream_datafiles, year_first, year_last)
stream_datafiles = stream_datafiles.strip()
#endif
if stream_vars[node_name]:
if stream_vars[node_name]:
stream_vars[node_name] += "\n " + self._add_xml_delimiter(stream_datafiles.split("\n"), "file")
else:
stream_vars[node_name] = self._add_xml_delimiter(stream_datafiles.split("\n"), "file")

elif ( node_name == 'stream_meshfile'
or node_name == 'stream_mapalgo'
or node_name == 'stream_tintalgo'
or node_name == 'stream_taxmode'
or node_name == 'stream_mapalgo'
or node_name == 'stream_tintalgo'
or node_name == 'stream_taxmode'
or node_name == 'stream_dtlimit'):
attributes['model_grid'] = case.get_value("GRID")
attributes['compset'] = case.get_value("COMPSET")
Expand All @@ -130,7 +134,7 @@ def create_stream_xml(self, stream_names, case, streams_xml_file, data_list_file
elif node_name.strip():
# Get the other dependencies
stream_dict = self._add_value_to_dict(stream_vars, case, node)

# append to stream xml file
stream_file_text = _stream_nuopc_file_template.format(**stream_vars)
with open(streams_xml_file, 'a') as stream_file:
Expand Down Expand Up @@ -193,7 +197,7 @@ def _get_input_file_hash(self, data_list_file):

def _get_value_match(self, node, child_name, attributes=None, exact_match=False):
'''
Get the first best match for multiple tags in child_name based on the
Get the first best match for multiple tags in child_name based on the
attributes input

<values...>
Expand Down Expand Up @@ -396,5 +400,3 @@ def _add_xml_delimiter(list_to_deliminate, delimiter):
#endif
#endfor
return "\n ".join(list_to_deliminate)


1 change: 1 addition & 0 deletions datm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ target_include_directories (datm PRIVATE ${CMAKE_SOURCE_DIR})
target_include_directories (datm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/share)
target_include_directories (datm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/streams)
target_include_directories (datm PRIVATE ${PIO_Fortran_INCLUDE_DIR})
target_include_directories (datm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../fox/include)
Loading