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

change default resolution #204

Merged
merged 122 commits into from
Oct 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
ae4051d
Merge pull request #1 from ufs-community/develop
DeniseWorthen Nov 20, 2019
6c0ea1d
Update .gitmodules
DeniseWorthen Nov 22, 2019
e72146c
update submodules for nems,stochastic_physics
DeniseWorthen Nov 22, 2019
190d88f
update NEMS,stochastic_physics
DeniseWorthen Nov 23, 2019
b9c578e
Merge pull request #2 from ufs-community/develop
DeniseWorthen Nov 27, 2019
0c8cb0b
update CICE submode for feature/halfdeg (with build change) and
DeniseWorthen Dec 2, 2019
fd535ff
Merge pull request #3 from ufs-community/develop
DeniseWorthen Dec 6, 2019
040d027
Revert "update CICE submode for feature/halfdeg (with build change) and"
DeniseWorthen Dec 6, 2019
6d15ca7
update CICE submodule
DeniseWorthen Dec 6, 2019
7bf2632
update develop branch in my fork to use NOAA-EMC develop branches
DeniseWorthen Dec 12, 2019
9d2b7a3
Merge pull request #5 from ufs-community/develop
DeniseWorthen Jan 1, 2020
d391b7c
Merge pull request #6 from ufs-community/develop
DeniseWorthen Jan 16, 2020
bf4bbce
Update configure.fv3_coupled.hera.intel
DeniseWorthen Jan 20, 2020
7809696
Update configure.fv3_coupled.cheyenne.intel
DeniseWorthen Jan 20, 2020
6a9bf46
Merge pull request #7 from ufs-community/develop
DeniseWorthen Jan 21, 2020
f94e746
Merge pull request #8 from ufs-community/develop
DeniseWorthen Jan 24, 2020
57236a6
update gitmodules, FV3 for gfsv16 incomming commit, NEMS for
DeniseWorthen Jan 24, 2020
2ac97e1
Revert changes that were meant for a branch, not develop
DeniseWorthen Jan 24, 2020
06506f2
Merge pull request #9 from ufs-community/develop
DeniseWorthen Jan 28, 2020
56e42ca
Merge pull request #13 from ufs-community/develop
DeniseWorthen Feb 1, 2020
fb154e5
Merge pull request #15 from ufs-community/develop
DeniseWorthen Feb 24, 2020
c5628b3
Merge pull request #17 from ufs-community/develop
DeniseWorthen Feb 27, 2020
82910d9
Merge pull request #18 from ufs-community/develop
DeniseWorthen Mar 30, 2020
82b06f6
Merge pull request #19 from ufs-community/develop
DeniseWorthen Apr 2, 2020
5058920
Merge pull request #20 from ufs-community/develop
DeniseWorthen Apr 16, 2020
1a8c02d
Merge pull request #22 from ufs-community/develop
DeniseWorthen Apr 27, 2020
9827916
Merge pull request #23 from ufs-community/develop
DeniseWorthen Apr 29, 2020
d13f9cf
Merge pull request #24 from ufs-community/develop
DeniseWorthen May 1, 2020
5381fc4
Merge pull request #25 from ufs-community/develop
DeniseWorthen May 4, 2020
7d96f6f
update MOM6 and CICE5 submodules for porting to
DeniseWorthen May 4, 2020
9e9aea9
Merge pull request #26 from ufs-community/develop
DeniseWorthen May 6, 2020
fb77e16
Merge pull request #27 from ufs-community/develop
DeniseWorthen May 12, 2020
2ad955e
Merge pull request #31 from ufs-community/develop
DeniseWorthen May 19, 2020
ddbaa0f
Merge pull request #33 from ufs-community/develop
DeniseWorthen May 28, 2020
ad61814
Merge pull request #34 from ufs-community/develop
DeniseWorthen Jun 1, 2020
208df8c
Merge pull request #35 from ufs-community/develop
DeniseWorthen Jun 5, 2020
08d80cd
Merge pull request #36 from ufs-community/develop
DeniseWorthen Jun 5, 2020
63ab6a7
update FV3 for frac grid work
DeniseWorthen Jun 5, 2020
c3968ad
Revert "update FV3 for frac grid work"
DeniseWorthen Jun 5, 2020
9271356
Merge pull request #38 from ufs-community/develop
DeniseWorthen Jun 13, 2020
ebe5094
Merge pull request #40 from ufs-community/develop
DeniseWorthen Jun 16, 2020
328ffce
Enable rt.sh dependency relations
MinsukJi-NOAA Jun 17, 2020
b3b28c5
Change how DEP_RUN is exported. Change fv3_mom6_cice to fcst in the m…
MinsukJi-NOAA Jun 17, 2020
7dac41b
add orion RT result logs
MinsukJi-NOAA Jun 18, 2020
5d4c978
add Hera RT result logs
MinsukJi-NOAA Jun 18, 2020
dafadf4
add dependencies for 35d tests
MinsukJi-NOAA Jun 19, 2020
318ffd4
remove temporary file fv3_slurm.IN
MinsukJi-NOAA Jun 19, 2020
226b885
Merge pull request #41 from MinsukJi-NOAA/feature/rt-dependency
DeniseWorthen Jun 19, 2020
3ca67bc
Merge pull request #42 from ufs-community/develop
DeniseWorthen Jun 25, 2020
18c0b06
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 26, 2020
d0da9c8
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jul 7, 2020
c9fed74
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jul 10, 2020
f9a62f1
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jul 15, 2020
c03fcde
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jul 15, 2020
186f489
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jul 16, 2020
bab0180
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jul 21, 2020
3fe4565
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jul 27, 2020
d5812c3
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jul 29, 2020
901705d
update cice for new develop branch
DeniseWorthen Aug 3, 2020
793e222
Revert "update cice for new develop branch"
DeniseWorthen Aug 3, 2020
3bf5e6d
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Aug 4, 2020
fc867cc
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Aug 7, 2020
6d2b2c1
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Aug 7, 2020
9615e34
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Aug 14, 2020
52d1523
add git templates (#46)
DeniseWorthen Aug 17, 2020
533bfbd
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Aug 18, 2020
610f8fc
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Aug 20, 2020
88e5918
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Aug 27, 2020
4cf9b77
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Sep 8, 2020
b3cd62f
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Sep 8, 2020
26e1d06
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Sep 10, 2020
e6388ee
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Sep 16, 2020
64e97fe
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Sep 17, 2020
aa58eca
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Sep 21, 2020
5f06eca
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Sep 23, 2020
6de4c02
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Sep 28, 2020
72cbf34
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Sep 29, 2020
a5fc84e
change default resolution in existing tests; add 3 s2s tests which
DeniseWorthen Sep 29, 2020
76d1a27
changes for 35d testing
DeniseWorthen Sep 30, 2020
b54aae0
remove unuesed bmark restart test
DeniseWorthen Sep 30, 2020
9af4fd8
add repro-ing tests to rt.conf
DeniseWorthen Sep 30, 2020
566cb85
change name of variable used to control frac grid input
DeniseWorthen Sep 30, 2020
85b29b2
35d test changes for wave template
DeniseWorthen Sep 30, 2020
2a1ee30
s2s_control_c384 and s2s_bmark reproduce but the cpld_fv3_ccpp_mom6_c…
DeniseWorthen Sep 30, 2020
9c652bb
more 35d test changes
DeniseWorthen Sep 30, 2020
fc8e49f
cpld tests reprod and s2s_bmark, s2s_control_c384 reproduces correspo…
DeniseWorthen Sep 30, 2020
6928cb5
Merge branch 'feature/defaultres' of https://github.com/DeniseWorthen…
DeniseWorthen Sep 30, 2020
fa44163
add 35 day s2s tests
DeniseWorthen Sep 30, 2020
7593a52
fix 35d tests; now reproing
DeniseWorthen Sep 30, 2020
1dffc35
restore rt.conf to defaults
DeniseWorthen Sep 30, 2020
ed24106
all tests pass
DeniseWorthen Oct 1, 2020
50ae0f3
rename 35d conf files; return default values to 35d tests
DeniseWorthen Oct 1, 2020
39b5511
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Oct 1, 2020
5cb0fca
Merge branch 'develop' into feature/defaultres
DeniseWorthen Oct 2, 2020
1abbb59
cherry pick updates from low resolution branch
DeniseWorthen Oct 5, 2020
f84835d
re-test of restart test
DeniseWorthen Oct 5, 2020
25aff98
consistency changes w/ low res branch
DeniseWorthen Oct 5, 2020
f7be1c3
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Oct 9, 2020
157eb9a
Merge branch 'develop' into feature/defaultres
DeniseWorthen Oct 9, 2020
69eb57b
order the settings the same in each test for easier comparisons
DeniseWorthen Oct 13, 2020
89507f3
fix comparisons for frac tests; add frac control c384
DeniseWorthen Oct 13, 2020
665a95c
fix missing line in edit_inputs
DeniseWorthen Oct 13, 2020
f06874c
change dumpfreq in default vars since it is now controlled by nems.co…
DeniseWorthen Oct 13, 2020
fac759f
remove dumpfreq,dumpfreq_n where possible
DeniseWorthen Oct 13, 2020
a30b244
remove dumpfreq refs
DeniseWorthen Oct 13, 2020
b0bb4b6
one more change to sync w/ rtres
DeniseWorthen Oct 13, 2020
4cec766
all tests pass
DeniseWorthen Oct 13, 2020
e453545
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Oct 14, 2020
74e7635
Merge branch 'develop' into feature/defaultres
DeniseWorthen Oct 14, 2020
301265c
remove settings of mom6_thermo_span =true
DeniseWorthen Oct 14, 2020
9e535fe
white space
DeniseWorthen Oct 15, 2020
e279a49
add restart at c96mx025, switch default time to 1 day
DeniseWorthen Oct 18, 2020
22e94cd
rename s2s to cpld
DeniseWorthen Oct 19, 2020
8de424e
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Oct 20, 2020
1dd8652
Merge branch 'develop' into feature/defaultres
DeniseWorthen Oct 20, 2020
f8aa55d
add orion logs
DeniseWorthen Oct 20, 2020
84f8ec3
add dell-p3 logs
DeniseWorthen Oct 20, 2020
a280555
add hera logs
DeniseWorthen Oct 20, 2020
01b93d1
uncomment three tests
DeniseWorthen Oct 20, 2020
b744f6a
add orion logs
DeniseWorthen Oct 20, 2020
f1dc8cf
add dell-p3 logs
DeniseWorthen Oct 20, 2020
924e1ce
add hera logs
DeniseWorthen Oct 20, 2020
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
23 changes: 23 additions & 0 deletions parm/MOM_input_template_025
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,29 @@ LT_ENHANCE = 3 ! [nondim] default = 0
! 1 - Van Roekel et al. 2014/Li et al., 2016
! 2 - Multiplied w/ adjusted La.
! 3 - Added w/ adjusted La.
USE_WAVES = MOM6_USE_WAVES ! [Boolean] default = False
junwang-noaa marked this conversation as resolved.
Show resolved Hide resolved
! If true, enables surface wave modules.
WAVE_METHOD = "SURFACE_BANDS" ! default = "EMPTY"
! Choice of wave method, valid options include:
! TEST_PROFILE - Prescribed from surface Stokes drift
! and a decay wavelength.
! SURFACE_BANDS - Computed from multiple surface values
! and decay wavelengths.
! DHH85 - Uses Donelan et al. 1985 empirical
! wave spectrum with prescribed values.
! LF17 - Infers Stokes drift profile from wind
! speed following Li and Fox-Kemper 2017.
SURFBAND_SOURCE = "COUPLER" ! default = "EMPTY"
! Choice of SURFACE_BANDS data mode, valid options include:
! DATAOVERRIDE - Read from NetCDF using FMS DataOverride.
! COUPLER - Look for variables from coupler pass
! INPUT - Testing with fixed values.
STK_BAND_COUPLER = 3 ! default = 1
! STK_BAND_COUPLER is the number of Stokes drift bands in the coupler. This has
! to be consistent with the number of Stokes drift bands in WW3, or the model
! will fail.
SURFBAND_WAVENUMBERS = 0.04, 0.11, 0.3305 ! [rad/m] default = 0.12566
! Central wavenumbers for surface Stokes drift bands.
LT_ENHANCE_COEF = 0.044 ! [nondim] default = 0.447
! Coefficient for Langmuir enhancement if LT_ENHANCE > 1
LT_ENHANCE_EXP = -1.5 ! [nondim] default = -1.33
Expand Down
910 changes: 0 additions & 910 deletions parm/MOM_input_wave_template_025

This file was deleted.

2 changes: 1 addition & 1 deletion parm/model_configure.IN
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ memuse_verbose: .false.
atmos_nthreads: @[THRD]
use_hyper_thread: .false.
ncores_per_node: 24
restart_interval: @[FV3_RESTART_INTERVAL]
restart_interval: @[FV3_RESTART_H]
fhrot: @[FHROT]
output_1st_tstep_rst: .false.
atm_coupling_interval_sec: @[coupling_interval_fast_sec]
Expand Down
4 changes: 2 additions & 2 deletions parm/nems.configure.medcmeps_atm_ocn_ice.IN
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ ICE_attributes::
ProfileMemory = false
OverwriteSlice = true
mesh_ice = @[MESHICE]
stop_n = @[FHMAX]
stop_n = @[FV3_RESTART_H]
DeniseWorthen marked this conversation as resolved.
Show resolved Hide resolved
stop_option = nhours
stop_ymd = -999
::
Expand Down Expand Up @@ -94,7 +94,7 @@ ALLCOMP_attributes::
ScalarFieldName = cpl_scalars
start_type = @[RUNTYPE]
case_name = ufs.s2s
restart_n = @[FV3_RESTART_INTERVAL]
restart_n = @[FV3_RESTART_H]
restart_option = nhours
restart_ymd = -999
dbug_flag = @[cap_dbug_flag]
Expand Down
4 changes: 2 additions & 2 deletions parm/nems.configure.medcmeps_atm_ocn_ice_wav.IN
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ ICE_attributes::
ProfileMemory = false
OverwriteSlice = true
mesh_ice = @[MESHICE]
stop_n = @[FHMAX]
stop_n = @[FV3_RESTART_H]
stop_option = nhours
stop_ymd = -999
::
Expand Down Expand Up @@ -108,7 +108,7 @@ ALLCOMP_attributes::
ScalarFieldName = cpl_scalars
start_type = @[RUNTYPE]
case_name = ufs.s2s
restart_n = @[FV3_RESTART_INTERVAL]
restart_n = @[FV3_RESTART_H]
restart_option = nhours
restart_ymd = -999
dbug_flag = @[cap_dbug_flag]
Expand Down
101 changes: 0 additions & 101 deletions parm/nems.configure.medcoldcmeps_atm_ocn_ice.IN

This file was deleted.

115 changes: 0 additions & 115 deletions parm/nems.configure.medcoldcmeps_atm_ocn_ice_wav.IN

This file was deleted.

Loading