-
Notifications
You must be signed in to change notification settings - Fork 132
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
Add wave-ice coupling to nuopc/cmeps driver #782
Merged
Merged
Changes from all commits
Commits
Show all changes
133 commits
Select commit
Hold shift + click to select a range
0338d04
Merge pull request #1 from CICE-Consortium/master
DeniseWorthen 99470ed
Merge pull request #2 from CICE-Consortium/master
DeniseWorthen 71d2ded
Merge pull request #3 from CICE-Consortium/master
DeniseWorthen d46d691
merge latest master (#4)
DeniseWorthen 183218a
updated orbital calculations needed for cesm
10e7c20
fixed problems in updated orbital calculations needed for cesm
ce8e5a9
update CICE6 to support coupling with UFS
apcraig 8f0b5ee
Merge pull request #2 from apcraig/ufs01
dabail10 7ac0e3d
Merge pull request #1 from ESCOMP/nuopc
DeniseWorthen 80c9e6e
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 53715ea
put in changes so that both ufsatm and cesm requirements for potentia…
7e43703
Merge pull request #3 from mvertens/mvertens/nuopc
dabail10 397e588
Merge remote-tracking branch 'upstream/master'
DeniseWorthen 3bb3694
Convergence on ustar for CICE. (#452) (#5)
DeniseWorthen f41f1e9
Merge remote-tracking branch 'upstream/nuopc' into HEAD
DeniseWorthen e70d1ab
update icepack submodule
DeniseWorthen 308a1d4
Revert "update icepack submodule"
DeniseWorthen 7848fdf
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 6982ee4
Merge remote-tracking branch 'upstream/nuopc' into HEAD
DeniseWorthen 089f60f
update comp_ice.backend with temporary ice_timers fix
DeniseWorthen 6affdcf
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 b5a6058
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 415df0e
Merge branch 'nuopc' of https://github.com/ESCOMP/CICE into nuopc
dabail10 b4da8a6
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 239c7de
Merge branch 'nuopc' of https://github.com/ESCOMP/CICE into nuopc
dabail10 ad03424
Fix threading problem in init_bgc
dabail10 73e7774
Fix additional OMP problems
dabail10 46fcfba
changes for coldstart running
DeniseWorthen c762336
Move the forapps directory
dabail10 6bccf71
remove cesmcoupled ifdefs
DeniseWorthen 902e883
Fix logging issues for NUOPC
dabail10 178693a
Merge branch 'nuopc' of https://github.com/ESCOMP/CICE into nuopc
dabail10 b4afd2e
removal of many cpp-ifdefs
3a1b88b
fix compile errors
DeniseWorthen 41855fd
fixes to get cesm working
aea1aa8
update to latest nuopc changes
e4c989c
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 30a81cc
fixed white space issue
8ebdda9
Merge pull request #4 from mvertens/nuopc
dabail10 27dd3b7
Add restart_coszen namelist option
dabail10 50bf856
Merge remote-tracking branch 'upstream/master'
DeniseWorthen 6b4a277
Merge branch 'nuopc' into coszen
dabail10 93f0e86
Merge pull request #5 from ESCOMP/coszen
dabail10 f92bef3
update icepack submodule
DeniseWorthen 4e8cc79
Merge remote-tracking branch 'upstream/nuopc' into emc/develop
DeniseWorthen 8ff4ee0
change Orion to orion in backend
DeniseWorthen 916c6af
add -link_mpi=dbg to debug flags (#8)
DeniseWorthen 9bdb9ad
Merge remote-tracking branch 'CICE-Consortium/master' into emc/develop
DeniseWorthen 8f37bfc
cice6 compile (#6)
MinsukJi-NOAA 86b8dab
Merge remote-tracking branch 'upstream/emc/develop' into HEAD
DeniseWorthen c084de4
Merge remote-tracking branch 'upstream/master' into emc/develop
DeniseWorthen 88cc2fd
Merge remote-tracking branch 'upstream/master' into emc/develop
DeniseWorthen bdf1a1f
changes for consistency w/ current emc-cice5 (#13)
DeniseWorthen 5ecde75
Merge remote-tracking branch 'upstream/emc/develop' into emc/develop
DeniseWorthen d81a834
Fixcommit (#14)
DeniseWorthen 4d7ba5b
Merge remote-tracking branch 'upstream/master' into emc/develop
DeniseWorthen 5dcfca8
Merge remote-tracking branch 'upstream/emc/develop' into emc/develop
DeniseWorthen 285985c
Update CICE6 for integration to S2S
DeniseWorthen 6d30789
Merge remote-tracking branch 'upstream/emc/develop' into emc/develop
DeniseWorthen 8129aab
Merge remote-tracking branch 'consortium/master' into emc/develop
DeniseWorthen ac617cd
Support TACC stampede (#19)
MinsukJi-NOAA 23cdee7
Merge remote-tracking branch 'upstream/emc/develop' into emc/develop
DeniseWorthen 1e4f42b
update icepack
DeniseWorthen 2515f77
Merge remote-tracking branch 'consortium/master' into feature/updcice
DeniseWorthen 41afe74
add ice_dyn_vp module to CICE_InitMod
DeniseWorthen 2a0f332
update gitmodules, update icepack
DeniseWorthen f773ef3
Update CICE to consortium master (#23)
DeniseWorthen 840e931
Merge remote-tracking branch 'upstream/emc/develop' into emc/develop
DeniseWorthen 1e4d393
Merge remote-tracking branch 'upstream/emc/develop' into feature/updcice
DeniseWorthen 66546ae
Merge remote-tracking branch 'Consortium/master' into feature/updcice
DeniseWorthen 2eca569
update icepack
DeniseWorthen b52e91c
Merge remote-tracking branch 'upstream/emc/develop' into emc/develop
DeniseWorthen 51db2f9
Merge remote-tracking branch 'Consortium/master' into feature/updcice
DeniseWorthen d8fb6d9
switch icepack branches
DeniseWorthen 9a76541
update icepack
DeniseWorthen 519d339
Update CICE to latest Consortium master (#26)
DeniseWorthen 74e7b58
Merge remote-tracking branch 'upstream/emc/develop' into emc/develop
DeniseWorthen 9d88d92
add cice changes for zlvs (#29)
DeniseWorthen d1f2d15
Merge remote-tracking branch 'upstream/emc/develop' into emc/develop
DeniseWorthen 0c39047
Merge branch 'emc/develop' into feature/updcice
DeniseWorthen f3b2652
update icepack and pointer
DeniseWorthen 9057817
Merge remote-tracking branch 'Consortium/master' into feature/updcice
DeniseWorthen 1721728
Merge remote-tracking branch 'Consortium/master' into feature/updcice
DeniseWorthen 55586f7
update icepack and revert gitmodules
DeniseWorthen 441f693
Fix history features
apcraig 15763d8
revert set_nml.histall
apcraig b3364a6
fix implementation error
apcraig 96d5851
update model log output in ice_init
apcraig 7b5c2b4
Fix QC issues
apcraig c5794b4
Update testing
apcraig eaa3c3a
update documentation
apcraig e31ce7e
reset calchk to 100000 years
apcraig 83068c7
update evp1d test
apcraig 3fd897e
Merge branch 'master' of https://github.com/cice-consortium/cice into…
apcraig 4373d3d
update icepack
DeniseWorthen 71f4fe6
Merge remote-tracking branch 'TCraig/tmB' into feature/updcice
DeniseWorthen aeb473a
Merge remote-tracking branch 'Consortium/master' into feature/updcice
DeniseWorthen aade124
update icepack
DeniseWorthen 7f089d0
add memory profiling (#36)
DeniseWorthen 397b4bd
Merge branch 'NOAA-EMC:emc/develop' into feature/updcice
DeniseWorthen a1b3375
update icepack
DeniseWorthen 7d2139c
Merge remote-tracking branch 'Consortium/master' into feature/updcice
DeniseWorthen cd021b5
Merge remote-tracking branch 'Consortium/master' into feature/updcice
DeniseWorthen 5cb78cd
fix rhoa when lowest_temp is 0.0
DeniseWorthen d0a45a2
update icepack submodule
DeniseWorthen 2540695
Update CICE for latest Consortium master (#38)
DeniseWorthen 8a88024
Merge branch 'NOAA-EMC:emc/develop' into feature/updcice
DeniseWorthen d95bd51
Use CICE-Consortium/Icepack master (#40)
DeniseWorthen d83c67b
Merge branch 'NOAA-EMC:emc/develop' into feature/updcice
DeniseWorthen 8d4a3c6
recreate cap update branch (#42)
DeniseWorthen 55bf9f4
Merge remote-tracking branch 'Consortium/main' into feature/updcice
DeniseWorthen 7a0b65e
Merge branch 'emc/develop' into feature/updcice
DeniseWorthen abbebab
remove 2 extraneous lines
DeniseWorthen 8ff0fb2
duplicate gitmodule style for icepack
DeniseWorthen 27dfd1b
Update CICE to latest Consortium/main (#45)
DeniseWorthen c660075
Update CICE to Consortium/main (#48)
DeniseWorthen 4b28dfe
Merge remote-tracking branch 'Consortium/main' into feature/addCgrid
DeniseWorthen 247dc1d
fix comment, fix env for orion and hera
DeniseWorthen dd158e2
replace save_init with step_prep in CICE_RunMod
DeniseWorthen ae50efe
fixes for cgrid repro
DeniseWorthen cbc6046
remove added haloupdates
DeniseWorthen ab95d2d
Merge remote-tracking branch 'Consortium/main' into feature/addCgridf…
DeniseWorthen a38df37
Merge remote-tracking branch 'Consortium/main' into feature/addCgridf…
DeniseWorthen 2d5487a
change F->S for ocean velocities and tilts
DeniseWorthen 26498db
fix debug failure when grid_ice=C
DeniseWorthen 9e2dd69
respond to review comments
DeniseWorthen cc0f89c
remove inserted whitespace for uvelE,N and vvelE,N
DeniseWorthen 73cc18c
Merge remote-tracking branch 'Consortium/main' into feature/addCgridf…
DeniseWorthen 1f70caf
Merge remote-tracking branch 'Consortium/main' into feature/updcice
DeniseWorthen 968a0ed
Add wave-cice coupling; update to Consortium main (#51)
DeniseWorthen d6d081a
Merge branch 'emc/develop' into feature/updcice
DeniseWorthen 2e68b9e
Merge remote-tracking branch 'Consortium/main' into feature/updcice
DeniseWorthen b893ee9
add initializationsin ice_state
DeniseWorthen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,6 +25,7 @@ module ice_comp_nuopc | |
use ice_calendar , only : force_restart_now, write_ic | ||
use ice_calendar , only : idate, mday, mmonth, myear, year_init | ||
use ice_calendar , only : msec, dt, calendar, calendar_type, nextsw_cday, istep | ||
use ice_calendar , only : ice_calendar_noleap, ice_calendar_gregorian | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We had made this change in our cap already. |
||
use ice_kinds_mod , only : dbl_kind, int_kind, char_len, char_len_long | ||
use ice_fileunits , only : nu_diag, nu_diag_set, inst_index, inst_name | ||
use ice_fileunits , only : inst_suffix, release_all_fileunits, flush_fileunit | ||
|
@@ -80,9 +81,6 @@ module ice_comp_nuopc | |
character(len=*) , parameter :: orb_variable_year = 'variable_year' | ||
character(len=*) , parameter :: orb_fixed_parameters = 'fixed_parameters' | ||
|
||
character(len=*),parameter :: shr_cal_noleap = 'NO_LEAP' | ||
character(len=*),parameter :: shr_cal_gregorian = 'GREGORIAN' | ||
|
||
type(ESMF_Mesh) :: ice_mesh | ||
|
||
integer :: nthrds ! Number of threads to use in this component | ||
|
@@ -216,7 +214,6 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc) | |
type(ESMF_Time) :: stopTime ! Stop time | ||
type(ESMF_Time) :: refTime ! Ref time | ||
type(ESMF_TimeInterval) :: timeStep ! Model timestep | ||
type(ESMF_Calendar) :: esmf_calendar ! esmf calendar | ||
type(ESMF_CalKind_Flag) :: esmf_caltype ! esmf calendar type | ||
integer :: start_ymd ! Start date (YYYYMMDD) | ||
integer :: start_tod ! start time of day (s) | ||
|
@@ -339,7 +336,8 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc) | |
call get_component_instance(gcomp, inst_suffix, inst_index, rc) | ||
if (ChkErr(rc,__LINE__,u_FILE_u)) return | ||
|
||
inst_name = "ICE"//trim(inst_suffix) | ||
! inst_name = "ICE"//trim(inst_suffix) | ||
inst_name = "ICE" | ||
|
||
!---------------------------------------------------------------------------- | ||
! start cice timers | ||
|
@@ -470,9 +468,9 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc) | |
call ESMF_TimeGet( currTime, calkindflag=esmf_caltype, rc=rc ) | ||
if (ChkErr(rc,__LINE__,u_FILE_u)) return | ||
if (esmf_caltype == ESMF_CALKIND_NOLEAP) then | ||
calendar_type = shr_cal_noleap | ||
calendar_type = ice_calendar_noleap | ||
else if (esmf_caltype == ESMF_CALKIND_GREGORIAN) then | ||
calendar_type = shr_cal_gregorian | ||
calendar_type = ice_calendar_gregorian | ||
else | ||
call abort_ice( subname//'ERROR:: bad calendar for ESMF' ) | ||
end if | ||
|
@@ -581,9 +579,11 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc) | |
end if | ||
call icepack_query_parameters( tfrz_option_out=tfrz_option) | ||
if (tfrz_option_driver /= tfrz_option) then | ||
write(errmsg,'(a)') trim(subname)//'error: tfrz_option from driver '//trim(tfrz_option_driver)//& | ||
' must be the same as tfrz_option from cice namelist '//trim(tfrz_option) | ||
call abort_ice(trim(errmsg)) | ||
write(errmsg,'(a)') trim(subname)//'WARNING: tfrz_option from driver '//trim(tfrz_option_driver)//& | ||
' is overwriting tfrz_option from cice namelist '//trim(tfrz_option) | ||
write(nu_diag,*) trim(errmsg) | ||
call icepack_warnings_flush(nu_diag) | ||
call icepack_init_parameters(tfrz_option_in=tfrz_option_driver) | ||
endif | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We also have this in our version. |
||
|
||
! Flux convergence tolerance - always use the driver attribute value | ||
|
@@ -594,7 +594,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc) | |
read(cvalue,*) atmiter_conv_driver | ||
call icepack_query_parameters( atmiter_conv_out=atmiter_conv) | ||
if (atmiter_conv_driver /= atmiter_conv) then | ||
write(errmsg,'(a,d13.5,a,d13.5)') trim(subname)//'warning: atmiter_ from driver ',& | ||
write(errmsg,'(a,d13.5,a,d13.5)') trim(subname)//'WARNING: atmiter_ from driver ',& | ||
atmiter_conv_driver,' is overwritting atmiter_conv from cice namelist ',atmiter_conv | ||
write(nu_diag,*) trim(errmsg) | ||
call icepack_warnings_flush(nu_diag) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For completeness, we should probably add vsnon/vsnon_init and vicen/vicen_init.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can add these initializations. I had meant to test whether they might have fixed a similar issue I had when I looked at the tr_snow updates which were made (?) earlier this year.