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

Sync w/ latest ESCOMP/main #129

Merged
merged 791 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
791 commits
Select commit Hold shift + click to select a range
e155c9a
srt does not work with most recent cime, cmeps requires most recent c…
jedwards4b Jan 30, 2024
43953e8
fix srt test
jedwards4b Jan 30, 2024
682a497
fix cime checkout
jedwards4b Jan 30, 2024
87c473c
turn off tmate
jedwards4b Jan 30, 2024
1290140
fix path
jedwards4b Jan 30, 2024
455b2be
debug workflow
jedwards4b Jan 31, 2024
170adbe
give format a length
jedwards4b Jan 31, 2024
7e0908c
Merge pull request #420 from uturuncoglu/feature/inline
jedwards4b Jan 31, 2024
4127636
fix dummy arguments w/o values
DeniseWorthen Jan 31, 2024
fa78b46
Merge branch 'NOAA-EMC:emc/develop' into feature/nowarn
DeniseWorthen Feb 5, 2024
661993f
Initial add of code to handle dust emissions, as per the document htt…
ekluzek Feb 8, 2024
5c39417
fix leap day issue
jedwards4b Feb 29, 2024
14878f4
add cpl_scalar for tiled grids, other minor fixes
DeniseWorthen Mar 3, 2024
91cc86e
Merge remote-tracking branch 'ESCOMP/main' into feature/cplscalars
DeniseWorthen Mar 3, 2024
f8fb572
Merge remote-tracking branch 'origin/feature/nowarn' into feature/cpl…
DeniseWorthen Mar 3, 2024
3515360
set ntile=0 when ntile scalar doesn't exist
DeniseWorthen Mar 3, 2024
ac5520f
fix restarts when ntile>0
DeniseWorthen Mar 4, 2024
8b02ffe
Run MED -> GLC in CISM NOEVOLVE mode
billsacks Mar 12, 2024
e6dda63
Merge pull request #439 from jtruesdal/cmeps0.14.43_scamdev
jedwards4b Mar 13, 2024
45d63c4
add two fixes
DeniseWorthen Mar 13, 2024
efbfd44
set CCSM_BGC and CCSM_CO2_PPMV in MOM6+MARBL cases
mnlevy1981 Mar 13, 2024
8309884
modify dstmask for lnd->atm in UFS
DeniseWorthen Mar 13, 2024
b5ae6fe
Update U10 to be resolved wind; add variable for U10+gusts
megandevlan Mar 14, 2024
d79e34f
Merge tag 'cmeps0.14.50' into dust_emis_mod
ekluzek Mar 15, 2024
1825c2b
Merge pull request #436 from DeniseWorthen/feature/cplscalars
jedwards4b Mar 19, 2024
ac458c3
Do GLC -> MED based on med_to_glc rather than run_glc
billsacks Mar 20, 2024
e05cbff
Fix calculation of gustiness
megandevlan Mar 26, 2024
a0dbcc3
Merge branch 'main' into mdfowler/gustMods_updateU10
jedwards4b Mar 26, 2024
084dd8d
Merge pull request #440 from megandevlan/mdfowler/gustMods_updateU10
jedwards4b Mar 26, 2024
bfdc85b
Merge pull request #435 from jedwards4b/fix/leapday
jedwards4b Mar 26, 2024
8774a9a
changes needed for adding a dglc component
Mar 27, 2024
60be83b
fixes an issue with symbols in compset names on derecho
jedwards4b Mar 27, 2024
a641b0a
clean up
jedwards4b Mar 27, 2024
e884e50
Merge pull request #444 from jedwards4b/fix/symbolsincompsetname
jedwards4b Mar 28, 2024
ea966dd
Merge branch 'main' into feature/add_dglc
Mar 28, 2024
c223a3c
changes to add compatibility with NorESM requirements
Mar 29, 2024
0ce3cc6
restructured fd_cesm.yaml so that sections make sense and description…
Mar 29, 2024
b8542e4
Merge branch 'fix/symbolsincompsetname' into HEAD
jedwards4b Mar 29, 2024
f5473d6
fix for add_gusts when coldair_outbreak_mod = .true.
jedwards4b Mar 29, 2024
546b39b
now its working
jedwards4b Mar 29, 2024
545fd9f
clean up buildnml
jedwards4b Mar 29, 2024
f9169ce
updated to upcoming https://github.com/ESCOMP/CMEPS/pull/442
Mar 30, 2024
da7e7e8
Merge branch 'feature/add_dglc_sacks' into feature/add_dglc
Mar 30, 2024
cad2c33
updated coupling interval setting for dglc
Mar 30, 2024
f80f6ca
updated namelist_definition_drv.xml to bring in new wav2med auxiliary…
Mar 30, 2024
823f066
Output downscaled glacier data in cpl glc hist file (#441)
Katetc Mar 30, 2024
a077536
Merge pull request #446 from jedwards4b/fix/add_gusts
jedwards4b Apr 1, 2024
44cb901
fix issue with REST_OPTION=end
jedwards4b Apr 1, 2024
e24e0db
remove ESMF_GridCompGetInternalState from use statement, not working…
jedwards4b Apr 2, 2024
29a39fd
fix format error
jedwards4b Apr 2, 2024
777c380
need to allocate even though it is not used - nag
jedwards4b Apr 2, 2024
d6dc571
Merge pull request #449 from jedwards4b/fix/remove_use_ESMF_GridCompG…
jedwards4b Apr 2, 2024
2524eca
Merge branch 'main' into feature/add_dglc
mvertens Apr 3, 2024
07bbf45
fix internal ESMF divide by 0 error
jedwards4b Apr 4, 2024
bcaac2a
move all alarminit to nuopc_shr_methods in share code
jedwards4b Apr 4, 2024
53d64e7
Merge remote-tracking branch 'origin' into fix/nsteps_alarms
jedwards4b Apr 4, 2024
b2b2d46
fixes restart at end of run
jedwards4b Apr 6, 2024
3b1e50b
Merge pull request #445 from mvertens/feature/add_dglc
jedwards4b Apr 9, 2024
e22c4ea
Get to compile with nag compiler on izumi
ekluzek Apr 9, 2024
a7b782f
allow for ufs which does not use the gust code
jedwards4b Apr 10, 2024
65c02bd
Merge branch 'main' into fix/nsteps_alarms
jedwards4b Apr 10, 2024
27e647e
improve description for START_TOD variable
jedwards4b Apr 10, 2024
2c4139d
Merge branch 'fix/nsteps_alarms' of https://github.com/jedwards3b/CME…
jedwards4b Apr 10, 2024
cce82b9
Merge remote-tracking branch 'ESCOMP/main' into bugfix/aoflux4ufs
DeniseWorthen Apr 11, 2024
05f05ce
fix aoflux routine for ufs
DeniseWorthen Apr 11, 2024
1213981
changes for adding multi-level docn input to cdeps
Apr 24, 2024
2289571
implemented correct mapping of multi-level ocean to glc
Apr 24, 2024
22dd074
Remove ESMF in favor of shr_mpi_mod, it is simpler this way, this als…
ekluzek Apr 26, 2024
8d295a7
Merge branch 'dust_emis_mod' of github.com:ekluzek/CMEPS into dust_em…
ekluzek Apr 26, 2024
492faf0
Add somethings needed for unit-testing and fix things identified there
ekluzek Apr 30, 2024
408be02
CAM%DEV changed to CAM70
brian-eaton Apr 30, 2024
8d3cd26
check_if_initiatlized to is_NOT_initialized
ekluzek Apr 30, 2024
ecb6d45
Fix so unit test will PASS
ekluzek Apr 30, 2024
0285eeb
Spin off the option checker
ekluzek May 1, 2024
0577deb
update esmf build
jedwards4b May 14, 2024
359513d
fix pio path in github srt
jedwards4b May 14, 2024
b5165bb
working on srt
jedwards4b May 14, 2024
91213a0
more workflow updates
jedwards4b May 14, 2024
6a52258
work on ext build
jedwards4b May 15, 2024
e0007c0
case error correction
jedwards4b May 15, 2024
85f0153
try this for cdeps build
jedwards4b May 15, 2024
e10beac
more github workflow work
jedwards4b May 15, 2024
522dd60
clean up compiler warnings
jedwards4b May 15, 2024
158c82f
remove unused shr_sys_abort
jedwards4b May 16, 2024
978fcaa
fix cdeps cache issue
jedwards4b May 16, 2024
7715f0b
renames ww3dev to ww3
jedwards4b May 16, 2024
f1fa80d
Merge pull request #456 from mvertens/feature/update_docn
jedwards4b May 16, 2024
e3eba33
Merge tag 'cmeps0.14.60' into add_MARBL
mnlevy1981 May 16, 2024
23a52b2
avoid integer overflow by skipping mediator in restart loop
jedwards4b May 17, 2024
8fa0185
changes for trigrid
May 20, 2024
95d6f69
Merge pull request #457 from jedwards4b/ww3dev2ww3
jedwards4b May 22, 2024
6384ff4
Merge pull request #460 from jedwards4b/fix_mediator_restart
jedwards4b May 22, 2024
b3c1aa3
move glc2ocn with glc2rof
May 27, 2024
4a644c0
updates for cism2mosart coupling
May 29, 2024
a90affa
fixed ice discharge
May 30, 2024
b34de12
fixes for commit
May 31, 2024
d994773
Merge remote-tracking branch 'origin/feature/cism2mosart' into featur…
May 31, 2024
1451526
Add bilinr_nostd for wav2ice coupling
dabail10 May 31, 2024
452962c
bug fix
Jun 3, 2024
b3053ca
more updates
Jun 3, 2024
99113f0
Merge branch 'main' of https://github.com/ESCOMP/CMEPS into cam7
brian-eaton Jun 4, 2024
09132fd
Merge branch 'NOAA-EMC:emc/develop' into bugfix/aoflux4ufs
DeniseWorthen Jun 6, 2024
5ad8bfa
updates for cism->mosart->ocean routine
Jun 7, 2024
3e45430
more cleanup of mapping file specification
Jun 7, 2024
709de40
Merge remote-tracking branch 'ESCOMP/main' into bugfix/aoflux4ufs
DeniseWorthen Jun 7, 2024
21a692f
simply ufs fix for new aoflux variables
DeniseWorthen Jun 9, 2024
ec56320
generalized lnd2rof mapping
mvertens Jun 10, 2024
ac67312
updates to get f09_f09 working
Jun 10, 2024
dcabb38
test github testing in cime PR #4631
jedwards4b Jun 12, 2024
e643dfe
more cleanup
Jun 14, 2024
6bd2631
Merge branch 'feature/cism2mosart' into feature/trigrid
mvertens Jun 16, 2024
e35644a
fixed compilation problems
Jun 16, 2024
5e5c181
add simplification for how glc runoff is sent to mom/blom
Jun 18, 2024
396f5be
Merge pull request #464 from jedwards4b/test_cime_branch
jedwards4b Jun 18, 2024
3455b50
Revert "test github testing in cime PR #4631"
jedwards4b Jun 18, 2024
df68ec5
Merge pull request #468 from ESCOMP/revert-464-test_cime_branch
jedwards4b Jun 18, 2024
f79221e
replace manage-externals with git-fleximod
jedwards4b Jun 18, 2024
1e9f5dc
Merge pull request #469 from jedwards4b/test_github_workflow
jedwards4b Jun 18, 2024
4dca7c6
Merge remote-tracking branch 'origin/main' into feature/cism2mosart
jedwards4b Jun 18, 2024
d062482
Merge branch 'feature/cism2mosart' into feature/trigrid
mvertens Jun 18, 2024
a1209b8
fix for merging in trigrid
mvertens Jun 19, 2024
3737040
Merge remote-tracking branch 'ESCOMP/main' into bugfix/aoflux4ufs
DeniseWorthen Jun 19, 2024
90f815b
Merge pull request #462 from brian-eaton/cam7
jedwards4b Jun 20, 2024
ef749fa
Remove negative runoff by downweighting positive runoff globally
billsacks Jun 21, 2024
f3761e0
Removing negative runoff: Create a dedicated FieldBundle for mods
billsacks Jun 22, 2024
8133bdc
Add a namelist flag controlling the removal of negative runoff
billsacks Jun 22, 2024
f960f3e
Merge pull request #463 from mvertens/feature/cism2mosart
jedwards4b Jun 24, 2024
8b6aa75
this call is no longer needed and removing it fully removes the mct l…
jedwards4b Jun 24, 2024
e84e8a1
Merge pull request #452 from DeniseWorthen/bugfix/aoflux4ufs
jedwards4b Jun 24, 2024
95137f4
fix use_float=.true. for aux history files
DeniseWorthen Jun 24, 2024
dc501e9
fix indenting
DeniseWorthen Jun 24, 2024
d183d22
fix for UFS
Jun 24, 2024
49b94d0
Merge remote-tracking branch 'origin/main' into remove_negative_runoff
billsacks Jun 24, 2024
516b8ef
Remove negative runoff from new glc runoff fields
billsacks Jun 24, 2024
4c5996e
Don't try to remove negative runoff on an absent field
billsacks Jun 24, 2024
b2cb575
Merge pull request #472 from jedwards4b/remove_mct_init
jedwards4b Jun 25, 2024
94928de
Merge branch 'main' into fix/nsteps_alarms
jedwards4b Jun 25, 2024
2d3c1a7
updates for new fields from ocn
Jun 25, 2024
5624c70
fixes for problems found in UFS
Jun 25, 2024
293a46f
Merge tag 'cmeps0.14.70' into feature/trigrid
Jun 25, 2024
9b3cec2
fixed bug
Jun 25, 2024
66ce7e5
fixed bug
Jun 26, 2024
c5973fd
Merge pull request #471 from billsacks/remove_negative_runoff
jedwards4b Jun 26, 2024
6b58961
Merge pull request #461 from dabail10/wavice
jedwards4b Jun 26, 2024
e1335d3
Merge pull request #429 from ekluzek/dust_emis_mod
jedwards4b Jun 26, 2024
57290e2
merge to main, add timestamp to rpointer file name
jedwards4b Jun 26, 2024
1dd90c7
Merge pull request #470 from mvertens/feature/trigrid
jedwards4b Jun 26, 2024
06a825a
bug fix for wav2ocn_map
jedwards4b Jun 26, 2024
3fcfa97
Merge remote-tracking branch 'ESCOMP/main' into feature/fixfloat4auxhist
DeniseWorthen Jun 27, 2024
2bb653d
aux history (float) should not use ntiles
DeniseWorthen Jun 27, 2024
f2af60b
new fix for add_gusts
jedwards4b Jun 27, 2024
428ecc6
update share to use head of main in srt test
jedwards4b Jun 28, 2024
1605a75
debug workflow
jedwards4b Jun 28, 2024
7085a87
bug fix primarily for usf testing
Jul 1, 2024
fbb2318
remove redundent use statement
jedwards4b Jul 1, 2024
527f9a5
removed duplicate references
Jul 1, 2024
3305e11
Merge pull request #474 from jedwards4b/add_gust_fix3
jedwards4b Jul 1, 2024
7a265d7
Merge branch 'main' into feature/bugfix
jedwards4b Jul 1, 2024
47fb4e6
Merge pull request #477 from mvertens/feature/bugfix
jedwards4b Jul 1, 2024
96c9095
gnu reports an error if this unused variable is not allocated
jedwards4b Jul 9, 2024
c2ef06d
Merge pull request #479 from jedwards4b/fix/gnu_unallocated_array_error
jedwards4b Jul 9, 2024
df46cf1
Separate the control of removing negative runoff for lnd vs glc
billsacks Jul 9, 2024
1b8920c
Merge pull request #481 from billsacks/remove_negative_runoff_land_only
billsacks Jul 10, 2024
e4a5e58
make sure variables are allocated before deallocating (#480)
jedwards4b Jul 11, 2024
df41c29
Declare cnt variable needed with ESMF_AWARE_THREADING
billsacks Jul 12, 2024
ce9cfe2
fix bug in ocn2glc_coupling and add blom (#484)
mvertens Jul 12, 2024
f62eff7
Merge remote-tracking branch 'ESCOMP/main' into feature/fixfloat4auxhist
DeniseWorthen Jul 24, 2024
8a30f50
fixes from testing for ATM auxhist output
DeniseWorthen Jul 25, 2024
10ffcc8
Merge pull request #485 from billsacks/declare_cnt
jedwards4b Jul 25, 2024
fdb9e0e
fix an error in the aoflux wind_gust fields
jedwards4b Jul 25, 2024
4520051
Merge pull request #487 from jedwards4b/fix/aoflux_merge_error
jedwards4b Jul 25, 2024
674f026
Merge remote-tracking branch 'ESCOMP/main' into HEAD
DeniseWorthen Jul 26, 2024
882d485
fix garbled print statement for scalars
DeniseWorthen Jul 26, 2024
e6ad652
Compute and export heat content associated with glc runoffs
alperaltuntas Jul 27, 2024
5adf83a
nan was picked up in pslv field on first pass
jedwards4b Jul 31, 2024
72280dd
Merge pull request #488 from DeniseWorthen/feature/fixfloat4auxhist
jedwards4b Aug 1, 2024
739b964
Merge pull request #489 from alperaltuntas/add_glc_runoff_heat_content
jedwards4b Aug 1, 2024
a41d9c2
Merge pull request #490 from jedwards4b/fix_nan_in_pslv
jedwards4b Aug 1, 2024
6851c9d
Changes the default PIO format from 64bit_offset to 64bit_data
briandobbins Aug 2, 2024
6c5b8fb
Merge pull request #492 from briandobbins/change_to_64bit_data_format
jedwards4b Aug 2, 2024
326ccf6
Merge branch 'main' into add_MARBL
mnlevy1981 Aug 5, 2024
a02f2ef
Remove POP2 references from config_component_cesm
mnlevy1981 Aug 5, 2024
2fba8e8
add CASE_GIT_REPOSITORY variable
jedwards4b Aug 7, 2024
7585948
Merge pull request #494 from jedwards4b/add_case_git_repository
jedwards4b Aug 7, 2024
d96fdf7
Merge pull request #493 from mnlevy1981/add_MARBL
jedwards4b Aug 8, 2024
1e4bba0
Simplify logic for glc_renormalize_smb
billsacks Aug 8, 2024
e71a5aa
Merge pull request #495 from billsacks/simplify_glc_renormalize_smb
billsacks Aug 9, 2024
34acae4
wav2ocn and ocn2wav maps are still needed in some cases
jedwards4b Aug 12, 2024
1fd6c7b
fix variable names
jedwards4b Aug 12, 2024
d8b0865
fix bug in med_diag_mod for ice runoff (#497)
mvertens Aug 12, 2024
9c3751e
add samegrid_ocn_wav to buildnml and use in namelist generation
jedwards4b Aug 12, 2024
612ba59
fix problem with no coupler file written at restart interval
mvertens Aug 20, 2024
864b7ce
Merge pull request #499 from mvertens/feature/fix_erp_dglc_test
jedwards4b Aug 21, 2024
865adc1
removed rpointer timestamp, merged to main
jedwards4b Aug 21, 2024
0b6518d
cleanup work
jedwards4b Aug 21, 2024
3677094
Merge remote-tracking branch 'origin/main' into fix/nsteps_alarms
jedwards4b Aug 21, 2024
ee628d1
fix dglc setting and remove end run alarm for the moment
jedwards4b Aug 21, 2024
59b0c10
remove unused code
jedwards4b Aug 21, 2024
bfb0c28
update github workflow
jedwards4b Aug 22, 2024
086762b
remove unused variable
jedwards4b Aug 22, 2024
0db1554
update github workflow
jedwards4b Aug 22, 2024
5b7d769
Merge pull request #447 from jedwards4b/fix/nsteps_alarms
jedwards4b Aug 22, 2024
f67cb8a
add timestamps to rpointer files
jedwards4b Aug 30, 2024
0341aeb
add timestamps to rpointer files
jedwards4b Sep 6, 2024
79a598d
updated dms exchange
mvertens Sep 14, 2024
771c4d4
Only add gust fields if add_gusts is true
billsacks Sep 20, 2024
81ac924
first_time needs to be saved
jedwards4b Sep 22, 2024
680221e
Merge branch 'main' into feature/update_dms_exchange
mvertens Sep 23, 2024
dd8d177
improve print timing of orbital parameters
jedwards4b Sep 26, 2024
5021dd8
updated code to work on betzy
mvertens Sep 27, 2024
17b48d9
Use srcTermProcessing=0 for all xgrid FieldRegridStore calls
billsacks Sep 27, 2024
b1e2325
Merge pull request #501 from billsacks/fix_xgrid_f_compset
billsacks Sep 28, 2024
842be8a
Merge pull request #506 from billsacks/fix_xgrid_reproducibility
billsacks Sep 28, 2024
c0ec79e
update github workflow
jedwards4b Sep 30, 2024
7c75a56
update github workflow
jedwards4b Sep 30, 2024
a664d62
Merge pull request #498 from jedwards4b/reintroduce_wav2ocn_maps
jedwards4b Sep 30, 2024
f4f64c3
Merge pull request #504 from mvertens/feature/update_dms_exchange
jedwards4b Sep 30, 2024
27c2af7
remove unused subroutine
jedwards4b Oct 1, 2024
d4e7462
Update ice2wav maps
dabail10 Oct 1, 2024
43bd7bf
Merge remote-tracking branch 'origin/main' into add_timestamp_rpointer
jedwards4b Oct 2, 2024
d6b8a21
variable name in namelist_definition_drv.xml did not match that used …
jedwards4b Oct 2, 2024
deedc25
Merge pull request #511 from jedwards4b/fix/ocn2wav_smap_issue
jedwards4b Oct 2, 2024
6fbffcb
add new xml vars for GPU configuration
sjsprecious Oct 4, 2024
1355710
Merge pull request #512 from sjsprecious/update_xml_vars_for_gpu_config
jedwards4b Oct 7, 2024
507aa7a
add memory usage variables for use on derecho
jedwards4b Oct 9, 2024
3cc308f
debug github workflow
jedwards4b Oct 14, 2024
8a892c5
rearrange externals
jedwards4b Oct 14, 2024
15a480e
Use xgrid for aoflux calculation unless atm & ocn are on the same grid
billsacks Oct 16, 2024
e649244
Add a test with aoflux_grid = ogrid
billsacks Oct 16, 2024
4883961
do not stop ringing alarm
jedwards4b Oct 17, 2024
de94803
Ensure psfc is always allocated
billsacks Oct 17, 2024
0bbdcd0
More correct fix to ensure psfc is allocated when needed
billsacks Oct 18, 2024
d9255d5
Tweak conditional for setting psfc for ufs
billsacks Oct 22, 2024
0de751f
Merge pull request #514 from billsacks/allocate_psfc
billsacks Oct 23, 2024
aa7f5c1
Merge branch 'main' into xgrid_default
billsacks Oct 24, 2024
27f4ecb
Merge pull request #515 from billsacks/xgrid_default
jedwards4b Oct 24, 2024
959e9a0
Merge pull request #513 from jedwards4b/add_mem_variables
jedwards4b Nov 22, 2024
6d47c50
Merge pull request #500 from jedwards4b/add_timestamp_rpointer
jedwards4b Dec 4, 2024
630c935
do not write restart at end of erc test
jedwards4b Dec 5, 2024
0e5ca48
Merge pull request #516 from jedwards4b/erc_test_fix
jedwards4b Dec 5, 2024
741f327
Merge remote-tracking branch 'ESCOMP/main' into feature/updcmeps
DeniseWorthen Dec 5, 2024
63a4a31
Merge pull request #503 from jedwards4b/fix/ocnalb_orbprint
jedwards4b Dec 6, 2024
e1f50a2
update retrieval and writing of dststatus fields
DeniseWorthen Dec 8, 2024
1ba5f11
restart at end of run needs to be false for these tests
jedwards4b Dec 9, 2024
d8b0155
Merge pull request #517 from DeniseWorthen/feature/fbdstatus
jedwards4b Dec 9, 2024
18d5cb7
Merge pull request #507 from dabail10/wavice2
jedwards4b Dec 9, 2024
6b270ad
update cdeps version in extbuild
jedwards4b Dec 9, 2024
51d4124
Merge pull request #518 from jedwards4b/add_eri_to_excpetions
jedwards4b Dec 9, 2024
a118c1d
Merge remote-tracking branch 'ESCOMP/main' into feature/updcmeps
DeniseWorthen Dec 10, 2024
507ca48
Merge branch 'NOAA-EMC:emc/develop' into feature/updcmeps
DeniseWorthen Dec 12, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/extbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jobs:
ESMF_VERSION: v8.6.1
PNETCDF_VERSION: checkpoint.1.12.3
NETCDF_FORTRAN_VERSION: v4.6.1
PIO_VERSION: pio2_6_2
CDEPS_VERSION: cdeps1.0.36
PIO_VERSION: pio2_6_3
CDEPS_VERSION: cdeps1.0.59
steps:
- uses: actions/checkout@v4
# Build the ESMF library, if the cache contains a previous build
Expand Down
20 changes: 11 additions & 9 deletions .github/workflows/srt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ 3.10.9 ]
python-version: [ 3.x ]
env:
CC: mpicc
FC: mpifort
Expand All @@ -27,7 +27,7 @@ jobs:
LDFLAGS: "-L/usr/lib/x86_64-linux-gnu -lnetcdf -lnetcdff -lpnetcdf"
# Versions of all dependencies can be updated here
ESMF_VERSION: v8.6.1
PARALLELIO_VERSION: pio2_6_2
PARALLELIO_VERSION: pio2_6_3
CIME_MODEL: cesm
CIME_DRIVER: nuopc
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -78,13 +78,15 @@ jobs:
# cpl7 is needed - i think that's a bug
- name: checkout externals
run: |
git config --global user.name "${GITHUB_ACTOR}"
git config --global user.email "${GITHUB_ACTOR_ID}+${GITHUB_ACTOR}@users.noreply.github.com"
pushd cesm
./bin/git-fleximod update ccs_config cdeps share mct parallelio
./bin/git-fleximod update cime ccs_config cdeps share mct parallelio
cd ccs_config
git checkout main
cd ../
git clone https://github.com/ESMCI/cime
cd cime
cd ../cime
git checkout master
git status
if [[ ! -e "${PWD}/.gitmodules.bak" ]]
then
echo "Converting [email protected] to https://github.com urls in ${PWD}/.gitmodules"
Expand Down Expand Up @@ -172,6 +174,6 @@ jobs:
popd
# the following can be used by developers to login to the github server in case of errors
# see https://github.com/marketplace/actions/debugging-with-tmate for further details
- name: Setup tmate session
if: ${{ failure() }}
uses: mxschmitt/action-tmate@v3
# - name: Setup tmate session
# if: ${{ failure() }}
# uses: mxschmitt/action-tmate@v3
347 changes: 26 additions & 321 deletions cesm/driver/esm_time_mod.F90

Large diffs are not rendered by default.

Loading