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.

Sign up for GitHub

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

changes for consistency w/ current emc-cice5 #13

Merged
merged 29 commits into from
Aug 12, 2020
Merged

changes for consistency w/ current emc-cice5 #13

Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
d6a1d80
CICE addition of fswthru by components. (#479)
dabail10 Jul 9, 2020
15a884c
Update README.md
apcraig Jul 13, 2020
78b7a12
move Ktens out of basalstress conditional in diagnostic output (#488)
eclare108213 Jul 13, 2020
c22c6d5
clarify CICE citation info in doc (#487)
eclare108213 Jul 13, 2020
9bdb9ad
Merge remote-tracking branch 'CICE-Consortium/master' into emc/develop
DeniseWorthen Jul 15, 2020
ee5a0e9
Update README.md
apcraig Jul 15, 2020
a5d4ade
compile fixes
DeniseWorthen Jul 16, 2020
86b8dab
Merge remote-tracking branch 'upstream/emc/develop' into HEAD
DeniseWorthen Jul 17, 2020
661e6bf
Merge branch 'emc/develop' into feature/compilefix
DeniseWorthen Jul 17, 2020
b055c7f
Add restart_coszen namelist option (#480)
dabail10 Jul 17, 2020
c084de4
Merge remote-tracking branch 'upstream/master' into emc/develop
DeniseWorthen Jul 17, 2020
93fb9a2
Merge branch 'emc/develop' into feature/compilefix
DeniseWorthen Jul 17, 2020
e2d42ea
calendar fix for non-cesm
DeniseWorthen Jul 23, 2020
0379fe4
add some logging
DeniseWorthen Jul 24, 2020
d77ffb5
switch to sea_freezing_temperature for non-cesm
DeniseWorthen Jul 31, 2020
819eedd
Update CPP implementation (#490)
apcraig Jul 31, 2020
06b3be5
Remove "coupled" CPP flag, add ssh_stress namelist (#496)
apcraig Jul 31, 2020
9e8a300
Add support for .cice_set, git clone --depth=1, atmbndy namelist outp…
apcraig Jul 31, 2020
6a3e60c
Send swpen by category (#495)
dabail10 Jul 31, 2020
003aae0
Add sw_redist option to CICE (#497)
dabail10 Jul 31, 2020
c1f3612
Merge remote-tracking branch 'upstream/master' into feature/compilefix
DeniseWorthen Aug 3, 2020
dd5ecc9
changes to align w/ escomp/nuopc
DeniseWorthen Aug 4, 2020
6fffe75
add optional dbug_flag to the nems.configure
DeniseWorthen Aug 6, 2020
713e4ff
two minor fixes for dbug setting
DeniseWorthen Aug 6, 2020
ae0c2b4
fix blank line
DeniseWorthen Aug 6, 2020
12d16ed
Update Icepack to 4c42a82, non bit-for-bit changes (#499)
apcraig Aug 8, 2020
4fed278
Merge remote-tracking branch 'upstream/master' into feature/compilefix
DeniseWorthen Aug 10, 2020
69cd4a0
fix location of restart_coszen in namelists
DeniseWorthen Aug 12, 2020
732e86a
remove NEWCODE ifdefs
DeniseWorthen Aug 12, 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
Prev Previous commit
Next Next commit
move Ktens out of basalstress conditional in diagnostic output (CICE-… 
…Consortium#488)
  • Loading branch information
@eclare108213
eclare108213 authored Jul 13, 2020
commit 78b7a1220476685b439e8d81995e401923c8aeb1
2 changes: 1 addition & 1 deletion cicecore/cicedynB/general/ice_init.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1174,8 +1174,8 @@ subroutine input_data
write(nu_diag,1007) ' k2 = ', k2, ' free parameter for landfast ice'
write(nu_diag,1007) ' alphab = ', alphab, ' factor for landfast ice'
write(nu_diag,1007) ' threshold_hw = ', threshold_hw, ' max water depth for grounding ice'
write(nu_diag,1007) ' Ktens = ', Ktens, ' tensile strength factor'
endif
write(nu_diag,1007) ' Ktens = ', Ktens, ' tensile strength factor'
endif ! kdyn enabled

write(nu_diag,*) ' '
Expand Down