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

Jump to bottom

Izumi updates #321

Merged
merged 13 commits into from
Jun 5, 2020
Merged

Izumi updates #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 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
affd3a8
Update compilers on izumi
dabail10 Jun 4, 2020
b299062
Bug fix for initializing vin0new
dabail10 Jun 5, 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: 1 addition & 1 deletion columnphysics/icepack_therm_itd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1467,6 +1467,7 @@ subroutine add_new_ice (ncat, nilyr, &
d_an_latg(:) = c0
d_an_tot(:) = c0
d_an_newi(:) = c0
vin0new(:) = c0

if (tr_fsd) then
d_afsd_latg(:) = c0 ! diagnostics
Expand Down Expand Up @@ -1635,7 +1636,6 @@ subroutine add_new_ice (ncat, nilyr, &
endif ! aice0 > puny

! volume added to each category from lateral growth
vin0new(:) = c0
do n = 1, ncat
if (aicen(n) > c0) vin0new(n) = d_an_latg(n) * vicen(n)/aicen(n)
end do
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/env.izumi_gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source /usr/share/Modules/init/csh

module purge
module load compiler/gnu/8.2.0
module load compiler/gnu/9.3.0

setenv OMP_STACKSIZE 64M

Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/env.izumi_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source /usr/share/Modules/init/csh

module purge
module load compiler/intel/19.0.2
module load compiler/intel/20.0.1

setenv OMP_STACKSIZE 64M

Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/env.izumi_nag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source /usr/share/Modules/init/csh

module purge
module load compiler/nag/6.2
module load compiler/nag/6.2-8.1.0

setenv OMP_STACKSIZE 64M

Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/machines/env.izumi_pgi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source /usr/share/Modules/init/csh

module purge
module load compiler/pgi/18.10
module load compiler/pgi/20.1

setenv OMP_STACKSIZE 64M

Expand Down