From 158b4433b804bc40db40deb335bb9f33eaff5b7e Mon Sep 17 00:00:00 2001 From: David Bailey Date: Tue, 18 Feb 2020 13:59:40 -0700 Subject: [PATCH 1/3] Fix nt_zbgc_frac --- configuration/driver/icedrv_init_column.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration/driver/icedrv_init_column.F90 b/configuration/driver/icedrv_init_column.F90 index c708189f8..977d04fb2 100644 --- a/configuration/driver/icedrv_init_column.F90 +++ b/configuration/driver/icedrv_init_column.F90 @@ -1311,6 +1311,7 @@ subroutine init_zbgc nt_bgc_DMS = 0 nt_bgc_PON = 0 nt_bgc_hum = 0 + nt_zbgc_frac = 0 !----------------------------------------------------------------- ! Define array parameters @@ -1700,7 +1701,6 @@ subroutine init_zbgc endif ! tr_zaero !echmod keep trcr indices etc here but move zbgc_frac_init, zbgc_init_frac, tau_ret, tau_rel to icepack - nt_zbgc_frac = 0 if (nbtrcr > 0) then nt_zbgc_frac = ntrcr + 1 ntrcr = ntrcr + nbtrcr From affd3a81240c6dcc6854818ac4f3f4c81d4d5964 Mon Sep 17 00:00:00 2001 From: David Bailey Date: Thu, 4 Jun 2020 15:28:36 -0600 Subject: [PATCH 2/3] Update compilers on izumi --- configuration/scripts/machines/env.izumi_gnu | 2 +- configuration/scripts/machines/env.izumi_intel | 2 +- configuration/scripts/machines/env.izumi_nag | 2 +- configuration/scripts/machines/env.izumi_pgi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configuration/scripts/machines/env.izumi_gnu b/configuration/scripts/machines/env.izumi_gnu index ccfe9d2a1..5c3871cff 100755 --- a/configuration/scripts/machines/env.izumi_gnu +++ b/configuration/scripts/machines/env.izumi_gnu @@ -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 diff --git a/configuration/scripts/machines/env.izumi_intel b/configuration/scripts/machines/env.izumi_intel index ebc3770e9..9c2794a59 100755 --- a/configuration/scripts/machines/env.izumi_intel +++ b/configuration/scripts/machines/env.izumi_intel @@ -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 diff --git a/configuration/scripts/machines/env.izumi_nag b/configuration/scripts/machines/env.izumi_nag index 1cc4bc5d4..cbfc5928a 100755 --- a/configuration/scripts/machines/env.izumi_nag +++ b/configuration/scripts/machines/env.izumi_nag @@ -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 diff --git a/configuration/scripts/machines/env.izumi_pgi b/configuration/scripts/machines/env.izumi_pgi index b49ee727a..7a05b7df9 100755 --- a/configuration/scripts/machines/env.izumi_pgi +++ b/configuration/scripts/machines/env.izumi_pgi @@ -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 From b299062d2e46acd561ca329a9434aff03fc338c5 Mon Sep 17 00:00:00 2001 From: David Bailey Date: Fri, 5 Jun 2020 13:54:58 -0600 Subject: [PATCH 3/3] Bug fix for initializing vin0new --- columnphysics/icepack_therm_itd.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/columnphysics/icepack_therm_itd.F90 b/columnphysics/icepack_therm_itd.F90 index 9cd233049..4f773a14e 100644 --- a/columnphysics/icepack_therm_itd.F90 +++ b/columnphysics/icepack_therm_itd.F90 @@ -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 @@ -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