Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
7b826d4
update FV3
DeniseWorthen Mar 27, 2021
cea6fc6
update hera.intel modulefiles for testing
DeniseWorthen Mar 27, 2021
071275b
Revert "update hera.intel modulefiles for testing"
DeniseWorthen Mar 27, 2021
4db2ff2
Revert "update FV3"
DeniseWorthen Mar 27, 2021
5a8d4b6
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Mar 30, 2021
09716fe
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Mar 31, 2021
f778ec2
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 5, 2021
3ae6d69
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 9, 2021
f187e64
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 10, 2021
94f5e67
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 12, 2021
4100179
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 15, 2021
42d1a64
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 16, 2021
8a5575b
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 19, 2021
9a06325
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 20, 2021
6ba165f
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 21, 2021
1602558
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 22, 2021
2208dea
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 26, 2021
217e3f0
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 27, 2021
c553a61
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 28, 2021
52625f5
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 30, 2021
a248612
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 30, 2021
9a80b95
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 3, 2021
2ad32ab
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 5, 2021
258dc4e
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 7, 2021
20210f7
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 10, 2021
750b914
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 12, 2021
4f02568
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 13, 2021
a3fd6ad
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 14, 2021
4a082c0
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 18, 2021
8ff5a46
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 21, 2021
a66de98
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 21, 2021
9d13add
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 25, 2021
41e1e70
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 26, 2021
a04c704
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 29, 2021
52f688b
update CMEPS for escompPR
DeniseWorthen Jun 1, 2021
2c312c6
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 2, 2021
ceaf7ea
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 3, 2021
e32547f
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 4, 2021
128a986
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 8, 2021
9666be5
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 9, 2021
cf494c7
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 10, 2021
2e74cf4
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 11, 2021
f2108e4
Merge branch 'develop' into feature/updcmeps
DeniseWorthen Jun 11, 2021
e172ab5
update CMEPS
DeniseWorthen Jun 11, 2021
cb7787d
remove ESMF > 8 statements from CMakeLists.txt
DeniseWorthen Jun 11, 2021
2718b15
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jun 14, 2021
fc38c8f
Merge branch 'develop' into feature/updcmeps
DeniseWorthen Jun 14, 2021
c00af41
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jun 17, 2021
7102b14
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jun 17, 2021
695d87a
Merge branch 'develop' into feature/updcmeps
DeniseWorthen Jun 24, 2021
b239304
update CMEPS submodule
DeniseWorthen Jun 24, 2021
3d86e14
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jul 1, 2021
cf9a3a6
Merge branch 'develop' into feature/updcmeps
DeniseWorthen Jul 1, 2021
89d6a02
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 7, 2021
c69e4a2
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 12, 2021
f540c3c
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 14, 2021
006d9cb
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 16, 2021
141df40
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 16, 2021
fb985c4
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 20, 2021
a6a1291
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 21, 2021
5cf0645
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 22, 2021
85d3a67
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 23, 2021
3f07e19
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 26, 2021
8c60f22
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 27, 2021
d1cf180
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 28, 2021
4fe664a
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 30, 2021
37864a5
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 2, 2021
3e84f3f
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 5, 2021
3059f0d
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 6, 2021
2469f43
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 10, 2021
1ec3109
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 12, 2021
21e9efd
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 13, 2021
ea726bb
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 16, 2021
b8a72e9
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 18, 2021
b8226c7
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 18, 2021
14c1b23
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 20, 2021
bbd0563
Merge branch 'develop' into feature/updcmeps
DeniseWorthen Aug 21, 2021
56aec02
add new config settings to nems.configure
DeniseWorthen Aug 21, 2021
0680141
update esmf for testing cmeps
DeniseWorthen Aug 21, 2021
8e39fd0
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 23, 2021
841da31
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Aug 23, 2021
1fcb4be
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 25, 2021
e0b9ab3
Merge branch 'develop' into feature/updcmeps
DeniseWorthen Aug 26, 2021
63866ec
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 27, 2021
87b508e
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Aug 27, 2021
5359a09
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 30, 2021
61d48f0
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Sep 1, 2021
ed28401
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 3, 2021
6f0a7d9
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 3, 2021
1fdfd6c
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Sep 3, 2021
7ccadf0
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 7, 2021
ad3554a
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Sep 7, 2021
e759a95
update CMEPS w/ fix for dststatus_print
DeniseWorthen Sep 7, 2021
ca5fa34
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 10, 2021
621d109
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Sep 10, 2021
68907ae
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 13, 2021
80992b3
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 13, 2021
9e2a117
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Sep 13, 2021
e3507ee
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 15, 2021
d2aa73a
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 20, 2021
c48e920
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Sep 20, 2021
fcb2067
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 21, 2021
ae8992d
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Sep 21, 2021
26680f6
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 22, 2021
3975d5a
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Sep 22, 2021
0dff574
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 24, 2021
859216e
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Sep 24, 2021
96c8d6b
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 24, 2021
1172ca1
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 27, 2021
ac4dc37
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Sep 27, 2021
1f5fa8a
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 29, 2021
7832c73
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 30, 2021
88e2814
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 1, 2021
021a857
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Oct 1, 2021
50509d9
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 6, 2021
b1bb140
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Oct 6, 2021
3a6a419
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 7, 2021
0b235c8
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Oct 7, 2021
ef187d8
all cpld, hafs and cdeps related tests pass
DeniseWorthen Oct 8, 2021
b0d35dc
update CMEPS with addition of accum bundle refactor
DeniseWorthen Oct 8, 2021
f42b670
update CMEPS to include history refactor
DeniseWorthen Oct 13, 2021
8b8c82b
update CMEPS with latest bugfixes for CISM
DeniseWorthen Oct 15, 2021
d29a0b8
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 18, 2021
08fb5c0
Merge branch 'develop' into feature/updcmeps
DeniseWorthen Oct 18, 2021
4ebfe2e
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Oct 19, 2021
5ae17ea
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Oct 22, 2021
edf244d
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Oct 25, 2021
4a62c1f
Merge branch 'ufs-community:develop' into feature/updcmeps
DeniseWorthen Oct 28, 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 .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@
branch = develop
[submodule "CMEPS"]
path = CMEPS-interface/CMEPS
url = https://github.com/NOAA-EMC/CMEPS
branch = emc/develop
#url = https://github.com/NOAA-EMC/CMEPS.git
#branch = emc/develop
url = https://github.com/DeniseWorthen/CMEPS.git
branch = feature/updcmeps
[submodule "HYCOM"]
path = HYCOM-interface/HYCOM
url = https://github.com/NOAA-EMC/HYCOM-src
Expand Down
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Submodule CMEPS updated 64 files
+1 −1 .github/workflows/extbuild.yml
+2 −2 .travis.yml
+1 −1 cime_config/buildexe
+35 −20 cime_config/buildnml
+30 −73 cime_config/config_component.xml
+116 −88 cime_config/config_component_cesm.xml
+26 −2 cime_config/config_component_ufs.xml
+1,232 −1,039 cime_config/namelist_definition_drv.xml
+16 −0 cime_config/namelist_definition_drv_flds.xml
+5 −5 cime_config/runseq/driver_config.py
+11 −5 cime_config/runseq/gen_runseq.py
+12 −3 cime_config/runseq/runseq_general.py
+52 −222 cime_config/testdefs/testlist_drv.xml
+5 −0 cime_config/testdefs/testmods_dirs/drv/y100k/README
+1 −0 cime_config/testdefs/testmods_dirs/drv/y100k/shell_commands
+ doc/source/CMEPS-grid1.png
+ doc/source/CMEPS-grid2.png
+ doc/source/CMEPS-grid3.png
+171 −0 doc/source/addendum/fieldnames.rst
+11 −0 doc/source/addendum/index.rst
+68 −0 doc/source/addendum/req_attributes.rst
+134 −0 doc/source/addendum/req_attributes_cesm.rst
+0 −1 doc/source/conf.py
+247 −0 doc/source/esmflds.rst
+0 −53 doc/source/field_naming_convention.rst
+117 −0 doc/source/fractions.rst
+145 −0 doc/source/generic.rst
+6 −1 doc/source/index.rst
+628 −1 doc/source/introduction.rst
+85 −0 doc/source/prep.rst
+3 −14 drivers/cime/esm.F90
+3 −3 drivers/cime/esm_time_mod.F90
+7 −5 mediator/esmFlds.F90
+2,041 −851 mediator/esmFldsExchange_cesm_mod.F90
+2 −2 mediator/esmFldsExchange_hafs_mod.F90
+12 −0 mediator/fd_cesm.yaml
+334 −477 mediator/med.F90
+89 −67 mediator/med_diag_mod.F90
+20 −20 mediator/med_fraction_mod.F90
+10 −12 mediator/med_internalstate_mod.F90
+286 −373 mediator/med_io_mod.F90
+194 −218 mediator/med_map_mod.F90
+153 −25 mediator/med_merge_mod.F90
+50 −57 mediator/med_methods_mod.F90
+1,047 −325 mediator/med_phases_aofluxes_mod.F90
+1,629 −343 mediator/med_phases_history_mod.F90
+6 −6 mediator/med_phases_ocnalb_mod.F90
+12 −0 mediator/med_phases_post_atm_mod.F90
+32 −17 mediator/med_phases_post_glc_mod.F90
+14 −2 mediator/med_phases_post_ice_mod.F90
+58 −90 mediator/med_phases_post_lnd_mod.F90
+13 −1 mediator/med_phases_post_ocn_mod.F90
+13 −1 mediator/med_phases_post_rof_mod.F90
+14 −2 mediator/med_phases_post_wav_mod.F90
+21 −16 mediator/med_phases_prep_atm_mod.F90
+248 −264 mediator/med_phases_prep_glc_mod.F90
+9 −9 mediator/med_phases_prep_ice_mod.F90
+4 −4 mediator/med_phases_prep_lnd_mod.F90
+89 −55 mediator/med_phases_prep_ocn_mod.F90
+182 −129 mediator/med_phases_prep_rof_mod.F90
+1 −1 mediator/med_phases_prep_wav_mod.F90
+193 −196 mediator/med_phases_restart_mod.F90
+49 −24 mediator/med_time_mod.F90
+10 −2 nuopc_cap_share/nuopc_shr_methods.F90
3 changes: 3 additions & 0 deletions tests/parm/nems.configure.cpld.IN
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,7 @@ ALLCOMP_attributes::
use_coldstart = @[use_coldstart]
use_mommesh = @[use_mommesh]
eps_imesh = @[eps_imesh]
stop_n = @[FHMAX]
stop_option = nhours
stop_ymd = -999
::
3 changes: 3 additions & 0 deletions tests/parm/nems.configure.cpld_wave.IN
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,7 @@ ALLCOMP_attributes::
use_coldstart = @[use_coldstart]
use_mommesh = @[use_mommesh]
eps_imesh = @[eps_imesh]
stop_n = @[FHMAX]
stop_option = nhours
stop_ymd = -999
::
3 changes: 3 additions & 0 deletions tests/parm/nems.configure.datm_cdeps.IN
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,7 @@ ALLCOMP_attributes::
orb_mode = fixed_year
orb_mvelp = 1.e36
orb_obliq = 1.e36
stop_n = @[FHMAX]
stop_option = nhours
stop_ymd = -999
::
3 changes: 3 additions & 0 deletions tests/parm/nems.configure.hafs_atm_docn.IN
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ ALLCOMP_attributes::
orb_obliq = 1.e36
mediator_read_restart = @[USE_COLDSTART]
mediator_present = true
stop_n = @[FHMAX]
stop_option = nhours
stop_ymd = -999
::

ATM_modelio::
Expand Down
3 changes: 3 additions & 0 deletions tests/parm/nems.configure.hafs_atm_ocn.IN
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ ALLCOMP_attributes::
orb_obliq = 1.e36
mediator_read_restart = @[USE_COLDSTART]
mediator_present = true
stop_n = @[FHMAX]
stop_option = nhours
stop_ymd = -999
::

ATM_modelio::
Expand Down