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

update icepack, nag cleanup, remove tabs #361

Merged
merged 2 commits into from
Sep 11, 2019
Merged

update icepack, nag cleanup, remove tabs #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
329318b
update icepack, nag cleanup, remove tabs
apcraig Sep 6, 2019
cc55fcc
update dyrect in boxslotcyl
apcraig Sep 10, 2019
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
12 changes: 6 additions & 6 deletions cicecore/cicedynB/analysis/ice_history_bgc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@ module ice_history_bgc
f_peakval = 'x', f_bgc_Fed_ml = 'x', &
f_bgc_Fep_ml = 'x', f_bgc_hum_ml = 'x', &
f_bgc_N_cat1 = 'x', f_bgc_DOC_cat1 = 'x', &
f_bgc_DIC_cat1 = 'x', f_bgc_Nit_cat1 = 'x', &
f_bgc_DIC_cat1 = 'x', f_bgc_Nit_cat1 = 'x', &
f_bgc_Am_cat1 = 'x', f_bgc_Sil_cat1 = 'x', &
f_bgc_DMSPd_cat1= 'x', f_bgc_DMS_cat1 = 'x', &
f_bgc_DON_cat1 = 'x', f_bgc_Fed_cat1 = 'x', &
f_bgc_DON_cat1 = 'x', f_bgc_Fed_cat1 = 'x', &
f_bgc_hum_cat1 = 'x', f_bgc_Fep_cat1 = 'x', &
f_bgc_PON_cat1 = 'x'

Expand Down Expand Up @@ -226,20 +226,20 @@ module ice_history_bgc
n_upNO , n_upNH , &
n_bTin , n_bphi , &
n_iDi , n_iki , &
n_bgc_PON , n_bgc_PON_ml , &
n_bgc_PON , &
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume these BGC variables are never used? I had left a bunch in as they were potentially to be used in the future.

n_fbri , n_hbri , &
n_zfswin , n_Nitnet , &
n_Amnet , n_Silnet , &
n_humnet , &
n_humnet , &
n_DMSPpnet , n_DMSPdnet , &
n_DMSnet , n_PONnet , &
n_Nitsnow , n_Amsnow , &
n_Silsnow , n_humsnow , &
n_DMSPpsnow , n_DMSPdsnow , &
n_DMSsnow , n_PONsnow , &
n_Nitfrac , n_Amfrac , &
n_Silfrac , n_zbgc_frac , &
n_humfrac , &
n_Silfrac , &
n_humfrac , &
n_DMSPpfrac , n_DMSPdfrac , &
n_DMSfrac , n_PONfrac , &
n_grownet , n_PPnet , &
Expand Down
16 changes: 8 additions & 8 deletions cicecore/cicedynB/analysis/ice_history_shared.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ module ice_history_shared
f_e22, &
f_s11, f_s12, &
f_s22, &
f_yieldstress11, &
f_yieldstress11, &
f_yieldstress12, &
f_yieldstress22

Expand Down Expand Up @@ -608,13 +608,13 @@ module ice_history_shared
n_keffn_top , &
n_Tinz , n_Sinz , &
n_Tsnz , &
n_a11 , n_a12 , &
n_e11 , n_e12 , &
n_e22 , &
n_s11 , n_s12 , &
n_s22 , &
n_yieldstress11, n_yieldstress12, &
n_yieldstress22
n_a11 , n_a12 , &
n_e11 , n_e12 , &
n_e22 , &
n_s11 , n_s12 , &
n_s22 , &
n_yieldstress11, n_yieldstress12, &
n_yieldstress22

interface accum_hist_field ! generic interface
module procedure accum_hist_field_2D, &
Expand Down
8 changes: 4 additions & 4 deletions cicecore/cicedynB/dynamics/ice_dyn_eap.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ subroutine eap (dt)
use ice_constants, only: field_loc_center, field_loc_NEcorner, &
field_type_scalar, field_type_vector
use ice_domain, only: nblocks, blocks_ice, halo_info, maskhalo_dyn
use ice_dyn_shared, only: fcor_blk, ndte, dtei, a_min, m_min, &
cosw, sinw, denom1, uvel_init, vvel_init, arlx1i, &
use ice_dyn_shared, only: fcor_blk, ndte, dtei, &
denom1, uvel_init, vvel_init, arlx1i, &
dyn_prep1, dyn_prep2, stepu, dyn_finish, &
basal_stress_coeff, basalstress
use ice_flux, only: rdg_conv, strairxT, strairyT, &
Expand Down Expand Up @@ -1615,9 +1615,9 @@ subroutine update_stress_rdg (ksub, ndte, divu, tension, &
invstressconviso, &
Angle_denom_gamma, Angle_denom_alpha, &
Tany_1, Tany_2, &
gamma, alpha, x, y, dx, dy, da, &
x, y, dx, dy, da, &
invdx, invdy, invda, invsin, &
invleng, dtemp1, dtemp2, atempprime, &
dtemp1, dtemp2, atempprime, &
kxw, kyw, kaw, &
puny, pi, pi2, piq, pih

Expand Down
6 changes: 3 additions & 3 deletions cicecore/cicedynB/dynamics/ice_dyn_evp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ module ice_dyn_evp
use ice_communicate, only: my_task
use ice_constants, only: field_loc_center, field_loc_NEcorner, &
field_type_scalar, field_type_vector
use ice_constants, only: c0, c4, p027, p055, p111, p166, &
p2, p222, p25, p333, p5, c1
use ice_constants, only: c0, p027, p055, p111, p166, &
p222, p25, p333, p5, c1
use ice_dyn_shared, only: stepu, dyn_prep1, dyn_prep2, dyn_finish, &
ndte, yield_curve, ecci, denom1, arlx1i, fcor_blk, uvel_init, &
vvel_init, basal_stress_coeff, basalstress, Ktens, revp
Expand Down Expand Up @@ -641,7 +641,7 @@ subroutine stress (nx_block, ny_block, &
tensionne, tensionnw, tensionse, tensionsw, & ! tension
shearne, shearnw, shearse, shearsw , & ! shearing
Deltane, Deltanw, Deltase, Deltasw , & ! Delt
puny , & ! puny
! puny , & ! puny
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one was commented instead of removed, was this intentional?

c0ne, c0nw, c0se, c0sw , & ! useful combinations
c1ne, c1nw, c1se, c1sw , &
ssigpn, ssigps, ssigpe, ssigpw , &
Expand Down
14 changes: 4 additions & 10 deletions cicecore/cicedynB/dynamics/ice_dyn_evp_1d.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,15 @@ subroutine domp_get_domain_rlu(lower,upper,d_lower,d_upper)

#if defined (_OPENMP)
use omp_lib, only : omp_in_parallel
#endif
use ice_constants, only: p5
#endif

integer(KIND=JPIM), intent(in) :: lower,upper
integer(KIND=JPIM), intent(out) :: d_lower,d_upper

#if defined (_OPENMP)
!-- local variables
real(kind=dbl_kind) :: dlen
integer(int_kind) :: lr, ur
#endif

character(len=*), parameter :: subname = '(domp_get_domain_rlu)'
Expand Down Expand Up @@ -969,9 +968,6 @@ module ice_dyn_evp_1d
use ice_kinds_mod
use ice_fileunits, only: nu_diag
use ice_exit, only: abort_ice
!-- BEGIN: specific for the KERNEL
use ice_dyn_shared, only: revp, ecci, denom1, arlx1i, brlx
!-- END: specific for the KERNEL

implicit none
private
Expand Down Expand Up @@ -1150,7 +1146,6 @@ subroutine evp_copyin_v2(nx,ny,nblk,nx_glob,ny_glob,
use ice_gather_scatter, only: gather_global_ext
use ice_domain, only: distrb_info
use ice_communicate, only: my_task, master_task
use ice_constants, only: c0,c1,p5

implicit none

Expand Down Expand Up @@ -1286,9 +1281,8 @@ subroutine evp_copyout(nx,ny,nblk,nx_glob,ny_glob, &
I_stress12_1,I_stress12_2,I_stress12_3,I_stress12_4, &
I_divu,I_rdg_conv,I_rdg_shear,I_shear,I_taubx,I_tauby )

use ice_constants, only : c0, field_loc_center, field_loc_NEcorner, &
field_type_scalar, field_type_vector
use ice_gather_scatter, only: scatter_global_ext, scatter_global
use ice_constants, only : c0
use ice_gather_scatter, only: scatter_global_ext
use ice_domain, only: distrb_info
use ice_communicate, only: my_task, master_task

Expand Down Expand Up @@ -1420,7 +1414,7 @@ subroutine evp_kernel_v2
implicit none

real(kind=dbl_kind) :: rhow
integer (kind=int_kind) :: ierr, lun, i, nthreads
integer (kind=int_kind) :: i, nthreads
integer (kind=int_kind) :: na,nb,navel

character(len=*), parameter :: subname = '(evp_kernel_v2)'
Expand Down
18 changes: 2 additions & 16 deletions cicecore/cicedynB/dynamics/ice_dyn_shared.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ module ice_dyn_shared

use ice_kinds_mod
use ice_communicate, only: my_task, master_task
use ice_constants, only: c0, c1, p01, p001
use ice_constants, only: c0, c1, c2, p01, p001
use ice_constants, only: omega, spval_dbl, p5, c4
use ice_blocks, only: nx_block, ny_block
use ice_domain_size, only: max_blocks
use ice_fileunits, only: nu_diag
Expand Down Expand Up @@ -115,7 +116,6 @@ end subroutine alloc_dyn_shared
subroutine init_evp (dt)

use ice_blocks, only: nx_block, ny_block
use ice_constants, only: c0, c2, omega
use ice_domain, only: nblocks
use ice_domain_size, only: max_blocks
use ice_flux, only: rdg_conv, rdg_shear, iceumask, &
Expand Down Expand Up @@ -205,12 +205,6 @@ end subroutine init_evp

subroutine set_evp_parameters (dt)

use ice_communicate, only: my_task, master_task
use ice_constants, only: p25, c1, c2, p5
use ice_domain, only: distrb_info
use ice_global_reductions, only: global_minval
use ice_grid, only: dxt, dyt, tmask

real (kind=dbl_kind), intent(in) :: &
dt ! time step

Expand Down Expand Up @@ -275,8 +269,6 @@ subroutine dyn_prep1 (nx_block, ny_block, &
strairx, strairy, &
tmass, icetmask)

use ice_constants, only: c0

integer (kind=int_kind), intent(in) :: &
nx_block, ny_block, & ! block dimensions
ilo,ihi,jlo,jhi ! beginning and end of physical domain
Expand Down Expand Up @@ -409,8 +401,6 @@ subroutine dyn_prep2 (nx_block, ny_block, &
uvel, vvel, &
Tbu)

use ice_constants, only: c0, c1

integer (kind=int_kind), intent(in) :: &
nx_block, ny_block, & ! block dimensions
ilo,ihi,jlo,jhi ! beginning and end of physical domain
Expand Down Expand Up @@ -877,8 +867,6 @@ subroutine basal_stress_coeff (nx_block, ny_block, &
vice, aice, &
hwater, Tbu)

use ice_constants, only: c0, c1

integer (kind=int_kind), intent(in) :: &
nx_block, ny_block, & ! block dimensions
icellu ! no. of cells where icetmask = 1
Expand Down Expand Up @@ -948,8 +936,6 @@ subroutine principal_stress(nx_block, ny_block, &
sig1, sig2, &
sigP)

use ice_constants, only: spval_dbl, p5, c4

integer (kind=int_kind), intent(in) :: &
nx_block, ny_block ! block dimensions

Expand Down
2 changes: 1 addition & 1 deletion cicecore/cicedynB/dynamics/ice_transport_remap.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ subroutine init_remap
! xxxav, xxyav, xyyav, yyyav

integer (kind=int_kind) :: &
i, j, iblk ! standard indices
i, j, iblk ! standard indices

character(len=*), parameter :: subname = '(init_remap)'

Expand Down
Loading