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

Fix a bug with the swredist code in ktherm=2. #332

Merged
merged 22 commits into from
Aug 19, 2020
Merged

Fix a bug with the swredist code in ktherm=2. #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
158b443
Fix nt_zbgc_frac
dabail10 Feb 18, 2020
93c6ab4
Merge branch 'master' of https://github.com/CICE-Consortium/Icepack
dabail10 Feb 20, 2020
8f3263d
Merge branch 'master' of https://github.com/CICE-Consortium/Icepack
dabail10 Feb 24, 2020
776316e
Merge branch 'master' of https://github.com/CICE-Consortium/Icepack
dabail10 Apr 2, 2020
a2219bf
Merge branch 'master' of https://github.com/CICE-Consortium/Icepack
dabail10 Apr 6, 2020
2abbfa7
Merge branch 'master' of https://github.com/CICE-Consortium/Icepack
dabail10 Apr 22, 2020
9bb6df7
Merge branch 'master' of https://github.com/ESCOMP/Icepack
dabail10 Apr 22, 2020
b72c0bc
Merge branch 'master' of https://github.com/CICE-Consortium/Icepack
dabail10 May 15, 2020
1f0195e
Merge branch 'master' of https://github.com/ESCOMP/Icepack
dabail10 May 15, 2020
78c0aef
Merge branch 'master' of https://github.com/CICE-Consortium/Icepack
dabail10 May 29, 2020
6a603cd
Merge branch 'master' of https://github.com/ESCOMP/Icepack
dabail10 May 29, 2020
d353104
Merge branch 'master' of https://github.com/CICE-Consortium/Icepack
dabail10 Jun 10, 2020
d9273f1
Merge branch 'master' of https://github.com/CICE-Consortium/Icepack
dabail10 Jun 24, 2020
2ec16b0
Merge branch 'master' of https://github.com/CICE-Consortium/Icepack
dabail10 Jul 6, 2020
a40bbf9
Merge branch 'master' of https://github.com/CICE-Consortium/Icepack
dabail10 Jul 13, 2020
faa181f
Merge branch 'master' of https://github.com/CICE-Consortium/Icepack
dabail10 Jul 16, 2020
a2950cc
Merge branch 'master' of https://github.com/CICE-Consortium/Icepack
dabail10 Jul 24, 2020
e920664
New developer guide module on adding diagnostics
dabail10 Jul 28, 2020
c4cc6da
Merge branch 'master' of https://github.com/CICE-Consortium/Icepack
dabail10 Aug 10, 2020
0cdcf42
Bug fix for dt_rhoi_hlyr
dabail10 Aug 18, 2020
4cdbfbf
Fix bug with swredist in ktherm 2
dabail10 Aug 18, 2020
00eb4cf
Remove spurious documentation
dabail10 Aug 18, 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
2 changes: 2 additions & 0 deletions columnphysics/icepack_therm_mushy.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,8 @@ subroutine temperature_changes_salinity(dt, &

if (sw_redist) then

dt_rhoi_hlyr = dt / (rhoi*hilyr)

do k = 1, nilyr

Iswabs_tmp = c0 ! all Iswabs is moved into fswsfc
Expand Down
7 changes: 7 additions & 0 deletions configuration/scripts/options/set_nml.swredist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
tr_pond_lvl = .true.
tr_pond_topo = .false.
tr_pond_cesm = .false.
ktherm = 2
sw_redist = .true.
sw_frac = 0.9d0
sw_dtemp = 0.02d0
1 change: 1 addition & 0 deletions configuration/scripts/tests/base_suite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ smoke col 1x1 debug,bgcISPOL
smoke col 1x1 debug,bgcNICE
smoke col 1x1 debug,bgcsklNICE
smoke col 1x1 debug,run1year,thermo1
smoke col 1x1 debug,run1year,swredist
smoke col 1x1 debug,run1year,swccsm3
smoke col 1x1 debug,run1year,alt01
smoke col 1x1 debug,run1year,alt02
Expand Down