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.

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

Dummy and unused variables. #180

Merged
merged 36 commits into from
Sep 22, 2018
Merged
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
ab28b45
Remove some dummy arguments and unused variables.
dabail10 Mar 20, 2018
7cb653a
Merge branch 'master' of https://github.com/dabail10/CICE
dabail10 Mar 20, 2018
d360f95
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 Mar 23, 2018
38ee675
Dummy variable cleanup
dabail10 Mar 23, 2018
8864f0e
Cleanup
dabail10 Apr 2, 2018
9c7d03e
Merge with trunk
dabail10 Apr 2, 2018
9c1056f
Merge pull request #1 from dabail10/dummy
dabail10 Apr 2, 2018
894f85c
Remove icepack from commit
dabail10 Apr 2, 2018
25b603c
Reset icepack master
dabail10 Apr 2, 2018
93e470a
Fix
dabail10 Apr 2, 2018
7021d13
Fix
dabail10 Apr 2, 2018
c738e5e
Update icepack
dabail10 Apr 2, 2018
60bffa8
fix
dabail10 Apr 2, 2018
4979014
Fix flush ifdef logic
dabail10 Apr 2, 2018
443029c
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 Apr 6, 2018
0ac1c6d
Updated dummy variables
dabail10 Apr 27, 2018
fe28cec
Uninitialized variables.
dabail10 May 1, 2018
b24930e
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 May 1, 2018
bd9bdd1
Additional initialization
dabail10 May 4, 2018
3c6305d
Update dummy
dabail10 May 16, 2018
24dcb3e
Update from master
dabail10 May 16, 2018
cb9e3c9
more dummy fixes
dabail10 Jun 4, 2018
6ee5463
Update from trunk
dabail10 Jun 4, 2018
77aee28
More hobart changes
dabail10 Jun 27, 2018
4cbdb64
Update to CICE master
dabail10 Jun 27, 2018
017fdf6
Update to CICE master
dabail10 Jun 27, 2018
f381e10
Merge pull request #2 from dabail10/dummy
dabail10 Jun 27, 2018
25f6da3
Update Hobart Intel settings
dabail10 Jun 27, 2018
0487249
Merge branch 'master' of https://github.com/dabail10/CICE
dabail10 Jun 27, 2018
ef78774
Additional Hobart Intel changes
dabail10 Jun 27, 2018
f9101ea
Update to CICE master
dabail10 Aug 22, 2018
263496a
Update icepack
dabail10 Aug 22, 2018
c7942e2
Some tweaks to dummy variables
dabail10 Aug 24, 2018
51f832f
Remove some initialization code.
dabail10 Aug 28, 2018
7f654e5
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 Aug 28, 2018
359c50d
Only remove istat checks in one routine.
dabail10 Sep 21, 2018
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
83 changes: 41 additions & 42 deletions cicecore/cicedynB/analysis/ice_diagnostics.F90
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
! SVN:$Id: ice_diagnostics.F90 1228 2017-05-23 21:33:34Z tcraig $
!=======================================================================

! Diagnostic information output during run
Expand All @@ -14,7 +13,7 @@ module ice_diagnostics
use ice_kinds_mod
use ice_communicate, only: my_task, master_task
use ice_constants, only: c0
use ice_calendar, only: diagfreq, istep1, istep
use ice_calendar, only: istep1
use ice_fileunits, only: nu_diag
use ice_fileunits, only: flush_fileunit
use ice_exit, only: abort_ice
Expand Down Expand Up @@ -86,7 +85,7 @@ module ice_diagnostics

! printing info for routine print_state
! iblkp, ip, jp, mtask identify the grid cell to print
character (char_len) :: plabel
! character (char_len) :: plabel
integer (kind=int_kind), parameter, public :: &
check_step = 999999999, & ! begin printing at istep1=check_step
iblkp = 1, & ! block number
Expand Down Expand Up @@ -116,14 +115,14 @@ subroutine runtime_diags (dt)
use ice_domain_size, only: ncat, n_aero, max_blocks
use ice_flux, only: alvdr, alidr, alvdf, alidf, evap, fsnow, frazil, &
fswabs, fswthru, flw, flwout, fsens, fsurf, flat, frzmlt_init, frain, fpond, &
coszen, fhocn_ai, fsalt_ai, fresh_ai, frazil_diag, &
fhocn_ai, fsalt_ai, fresh_ai, frazil_diag, &
update_ocn_f, Tair, Qa, fsw, fcondtop, meltt, meltb, meltl, snoice, &
dsnow, congel, sst, sss, Tf, fhocn, &
swvdr, swvdf, swidr, swidf, &
alvdr_init, alvdf_init, alidr_init, alidf_init
use ice_flux_bgc, only: faero_atm, faero_ocn
use ice_global_reductions, only: global_sum, global_sum_prod, global_maxval
use ice_grid, only: lmask_n, lmask_s, tarean, tareas, grid_type
use ice_grid, only: lmask_n, lmask_s, tarean, tareas
use ice_state ! everything
#ifdef CESMCOUPLED
use ice_prescribed_mod, only: prescribed_ice
Expand Down Expand Up @@ -1216,7 +1215,7 @@ subroutine total_salt (work)

use ice_blocks, only: nx_block, ny_block
use ice_domain, only: nblocks
use ice_domain_size, only: ncat, nilyr, nslyr, max_blocks
use ice_domain_size, only: ncat, nilyr, max_blocks
use ice_grid, only: tmask
use ice_state, only: vicen, trcrn

Expand Down Expand Up @@ -1595,7 +1594,7 @@ subroutine print_points_state(plabel,ilabel)

real (kind=dbl_kind) :: &
eidebug, esdebug, &
qi, qs, Tsnow, &
qi, qs, &
puny

integer (kind=int_kind) :: m, n, k, i, j, iblk, nt_Tsfc, nt_qice, nt_qsno
Expand Down Expand Up @@ -1675,41 +1674,41 @@ subroutine print_points_state(plabel,ilabel)
write(nu_diag,*) trim(llabel),'uvel=',uvel(i,j,iblk)
write(nu_diag,*) trim(llabel),'vvel=',vvel(i,j,iblk)

! write(nu_diag,*) ' '
! write(nu_diag,*) 'atm states and fluxes'
! write(nu_diag,*) ' uatm = ',uatm (i,j,iblk)
! write(nu_diag,*) ' vatm = ',vatm (i,j,iblk)
! write(nu_diag,*) ' potT = ',potT (i,j,iblk)
! write(nu_diag,*) ' Tair = ',Tair (i,j,iblk)
! write(nu_diag,*) ' Qa = ',Qa (i,j,iblk)
! write(nu_diag,*) ' rhoa = ',rhoa (i,j,iblk)
! write(nu_diag,*) ' swvdr = ',swvdr(i,j,iblk)
! write(nu_diag,*) ' swvdf = ',swvdf(i,j,iblk)
! write(nu_diag,*) ' swidr = ',swidr(i,j,iblk)
! write(nu_diag,*) ' swidf = ',swidf(i,j,iblk)
! write(nu_diag,*) ' flw = ',flw (i,j,iblk)
! write(nu_diag,*) ' frain = ',frain(i,j,iblk)
! write(nu_diag,*) ' fsnow = ',fsnow(i,j,iblk)
! write(nu_diag,*) ' '
! write(nu_diag,*) 'ocn states and fluxes'
! write(nu_diag,*) ' frzmlt = ',frzmlt (i,j,iblk)
! write(nu_diag,*) ' sst = ',sst (i,j,iblk)
! write(nu_diag,*) ' sss = ',sss (i,j,iblk)
! write(nu_diag,*) ' Tf = ',Tf (i,j,iblk)
! write(nu_diag,*) ' uocn = ',uocn (i,j,iblk)
! write(nu_diag,*) ' vocn = ',vocn (i,j,iblk)
! write(nu_diag,*) ' strtltx = ',strtltx(i,j,iblk)
! write(nu_diag,*) ' strtlty = ',strtlty(i,j,iblk)
! write(nu_diag,*) ' '
! write(nu_diag,*) 'srf states and fluxes'
! write(nu_diag,*) ' Tref = ',Tref (i,j,iblk)
! write(nu_diag,*) ' Qref = ',Qref (i,j,iblk)
! write(nu_diag,*) ' Uref = ',Uref (i,j,iblk)
! write(nu_diag,*) ' fsens = ',fsens (i,j,iblk)
! write(nu_diag,*) ' flat = ',flat (i,j,iblk)
! write(nu_diag,*) ' evap = ',evap (i,j,iblk)
! write(nu_diag,*) ' flwout = ',flwout(i,j,iblk)
! write(nu_diag,*) ' '
write(nu_diag,*) ' '
write(nu_diag,*) 'atm states and fluxes'
write(nu_diag,*) ' uatm = ',uatm (i,j,iblk)
write(nu_diag,*) ' vatm = ',vatm (i,j,iblk)
write(nu_diag,*) ' potT = ',potT (i,j,iblk)
write(nu_diag,*) ' Tair = ',Tair (i,j,iblk)
write(nu_diag,*) ' Qa = ',Qa (i,j,iblk)
write(nu_diag,*) ' rhoa = ',rhoa (i,j,iblk)
write(nu_diag,*) ' swvdr = ',swvdr(i,j,iblk)
write(nu_diag,*) ' swvdf = ',swvdf(i,j,iblk)
write(nu_diag,*) ' swidr = ',swidr(i,j,iblk)
write(nu_diag,*) ' swidf = ',swidf(i,j,iblk)
write(nu_diag,*) ' flw = ',flw (i,j,iblk)
write(nu_diag,*) ' frain = ',frain(i,j,iblk)
write(nu_diag,*) ' fsnow = ',fsnow(i,j,iblk)
write(nu_diag,*) ' '
write(nu_diag,*) 'ocn states and fluxes'
write(nu_diag,*) ' frzmlt = ',frzmlt (i,j,iblk)
write(nu_diag,*) ' sst = ',sst (i,j,iblk)
write(nu_diag,*) ' sss = ',sss (i,j,iblk)
write(nu_diag,*) ' Tf = ',Tf (i,j,iblk)
write(nu_diag,*) ' uocn = ',uocn (i,j,iblk)
write(nu_diag,*) ' vocn = ',vocn (i,j,iblk)
write(nu_diag,*) ' strtltx = ',strtltx(i,j,iblk)
write(nu_diag,*) ' strtlty = ',strtlty(i,j,iblk)
write(nu_diag,*) ' '
write(nu_diag,*) 'srf states and fluxes'
write(nu_diag,*) ' Tref = ',Tref (i,j,iblk)
write(nu_diag,*) ' Qref = ',Qref (i,j,iblk)
write(nu_diag,*) ' Uref = ',Uref (i,j,iblk)
write(nu_diag,*) ' fsens = ',fsens (i,j,iblk)
write(nu_diag,*) ' flat = ',flat (i,j,iblk)
write(nu_diag,*) ' evap = ',evap (i,j,iblk)
write(nu_diag,*) ' flwout = ',flwout(i,j,iblk)
write(nu_diag,*) ' '

endif ! my_task
enddo ! ncnt
Expand Down
45 changes: 14 additions & 31 deletions cicecore/cicedynB/analysis/ice_diagnostics_bgc.F90
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
! SVN:$Id: ice_diagnostics_bgc.F90 1447 2016-04-28 18:09:53Z [email protected] $
!=======================================================================

! Diagnostic information output during run
Expand All @@ -14,12 +13,11 @@ module ice_diagnostics_bgc
use ice_kinds_mod
use ice_communicate, only: my_task, master_task
use ice_constants, only: c0, mps_to_cmpdy, c100, p5, c1
use ice_calendar, only: diagfreq, istep1, istep
use ice_fileunits, only: nu_diag
use ice_fileunits, only: flush_fileunit
use ice_exit, only: abort_ice
use icepack_intfc, only: icepack_warnings_flush, icepack_warnings_aborted
use icepack_intfc, only: icepack_max_algae, icepack_max_aero, icepack_max_dic
use icepack_intfc, only: icepack_max_algae, icepack_max_aero
use icepack_intfc, only: icepack_max_doc, icepack_max_don, icepack_max_fe
use icepack_intfc, only: icepack_query_parameters, icepack_query_tracer_flags
use icepack_intfc, only: icepack_query_tracer_indices
Expand All @@ -42,18 +40,14 @@ module ice_diagnostics_bgc
! Cecilia M. Bitz, UW
! Nicole Jeffery, LANL

subroutine hbrine_diags (dt)
subroutine hbrine_diags

use ice_arrays_column, only: darcy_V
use ice_broadcast, only: broadcast_scalar, broadcast_array
use ice_diagnostics, only: npnt, print_points, pmloc, piloc, pjloc, pbloc, &
plat, plon
use ice_domain_size, only: ncat, nltrcr, nilyr
use ice_diagnostics, only: npnt, print_points, pmloc, piloc, pjloc, pbloc
use ice_domain_size, only: nilyr
use ice_state, only: aice, aicen, vicen, vice, trcr, trcrn

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

! local variables

integer (kind=int_kind) :: &
Expand Down Expand Up @@ -161,25 +155,21 @@ end subroutine hbrine_diags
! authors: Elizabeth C. Hunke, LANL
! Nicole Jeffery, LANL

subroutine bgc_diags (dt)
subroutine bgc_diags

use ice_arrays_column, only: ocean_bio, zfswin, fbio_atmice, fbio_snoice, &
Zoo, grow_net, ice_bio_net, trcrn_sw
use ice_broadcast, only: broadcast_scalar, broadcast_array
use ice_diagnostics, only: npnt, print_points, pmloc, piloc, pjloc, pbloc
use ice_domain_size, only: ncat, nltrcr, nblyr, n_algae, n_zaero, &
n_dic, n_doc, n_don, n_fed, n_fep, nilyr, nslyr
use ice_domain_size, only: ncat, nblyr, n_algae, n_zaero, &
n_doc, n_don, n_fed, n_fep, nilyr, nslyr
use ice_flux_bgc, only: flux_bio, flux_bio_atm
use ice_state, only:aice, vicen, vice, trcr
use ice_timers, only: timer_bgc, ice_timer_start, ice_timer_stop

real (kind=dbl_kind), intent(in) :: &
dt ! time step
use ice_state, only: vicen, vice, trcr

! local variables

integer (kind=int_kind) :: &
i, j, k, n, nn, ii,jj, iblk,kk, klev
i, j, k, n, nn, iblk,kk, klev
! fields at diagnostic points
real (kind=dbl_kind), dimension(npnt) :: &
pNit_sk, pAm_sk, pSil_sk, phum_sk, &
Expand Down Expand Up @@ -870,24 +860,20 @@ end subroutine bgc_diags
! Cecilia M. Bitz, UW
! Nicole Jeffery, LANL

subroutine zsal_diags (dt)
subroutine zsal_diags

use ice_arrays_column, only: fzsal, fzsal_g, sice_rho, bTiz, &
iDi, bphi, dhbr_top, dhbr_bot, darcy_V
use ice_blocks, only: nx_block, ny_block
use ice_broadcast, only: broadcast_scalar, broadcast_array
use ice_diagnostics, only: npnt, print_points, pmloc, piloc, pjloc, &
pbloc, plat, plon
use ice_domain_size, only: max_blocks, nblyr, ncat, nilyr
pbloc
use ice_domain_size, only: nblyr, ncat, nilyr
use ice_state, only: aicen, aice, vice, trcr, trcrn, vicen, vsno

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

! local variables

integer (kind=int_kind) :: &
i, j, k, n, nn, ii,jj, iblk
i, j, k, n, nn, iblk

! fields at diagnostic points
real (kind=dbl_kind), dimension(npnt) :: &
Expand All @@ -897,16 +883,13 @@ subroutine zsal_diags (dt)

! vertical fields of category 1 at diagnostic points for bgc layer model
real (kind=dbl_kind), dimension(npnt,nblyr+2) :: &
pphin, pgrid, pphin1
pphin, pphin1
real (kind=dbl_kind), dimension(npnt,nblyr) :: &
pSin, pSice, pSin1

real (kind=dbl_kind), dimension(npnt,nblyr+1) :: &
pbTiz, piDin

real (kind=dbl_kind), dimension (nx_block,ny_block,max_blocks) :: &
work1, work2

real (kind=dbl_kind) :: &
rhosi, rhow, rhos

Expand Down
15 changes: 6 additions & 9 deletions cicecore/cicedynB/analysis/ice_history.F90
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
! SVN:$Id: ice_history.F90 1228 2017-05-23 21:33:34Z tcraig $
!=======================================================================

! Driver for core history output
Expand Down Expand Up @@ -69,7 +68,7 @@ subroutine init_hist (dt)
histfreq_n, nstreams
use ice_domain_size, only: max_blocks, max_nstrm
use ice_dyn_shared, only: kdyn
use ice_flux, only: mlt_onset, frz_onset, albcnt, taubx, tauby
use ice_flux, only: mlt_onset, frz_onset, albcnt
use ice_history_shared ! everything
use ice_history_mechred, only: init_hist_mechred_2D, init_hist_mechred_3Dc
use ice_history_pond, only: init_hist_pond_2D, init_hist_pond_3Dc
Expand Down Expand Up @@ -1208,9 +1207,9 @@ subroutine accum_hist (dt)
taubx, tauby, strocnx, strocny, fm, daidtt, dvidtt, daidtd, dvidtd, fsurf, &
fcondtop, fsurfn, fcondtopn, flatn, fsensn, albcnt, &
stressp_1, stressm_1, stress12_1, &
stressp_2, stressm_2, stress12_2, &
stressp_3, stressm_3, stress12_3, &
stressp_4, stressm_4, stress12_4, sig1, sig2, sigP, &
stressp_2, &
stressp_3, &
stressp_4, sig1, sig2, sigP, &
mlt_onset, frz_onset, dagedtt, dagedtd, fswint_ai, keffn_top, &
snowfrac, alvdr_ai, alvdf_ai, alidr_ai, alidf_ai
use ice_arrays_column, only: snowfracn
Expand Down Expand Up @@ -1240,9 +1239,7 @@ subroutine accum_hist (dt)

real (kind=dbl_kind) :: &
qn , & ! temporary variable for enthalpy
sn , & ! temporary variable for salinity
Tmlts , & ! temporary variable for melting temperature
Tn ! temporary variable for ice temperature
sn ! temporary variable for salinity

real (kind=dbl_kind), dimension (nx_block,ny_block) :: &
worka, workb
Expand Down Expand Up @@ -1331,7 +1328,7 @@ subroutine accum_hist (dt)
!---------------------------------------------------------------

!$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,this_block, &
!$OMP k,n,qn,ns,worka,workb,Tinz4d,Sinz4d,Tsnz4d)
!$OMP k,n,qn,ns,sn,worka,workb,Tinz4d,Sinz4d,Tsnz4d)
do iblk = 1, nblocks
this_block = get_block(blocks_ice(iblk),iblk)
ilo = this_block%ilo
Expand Down
13 changes: 5 additions & 8 deletions cicecore/cicedynB/analysis/ice_history_bgc.F90
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
! SVN:$Id: ice_history_bgc.F90 1228 2017-05-23 21:33:34Z tcraig $
!=======================================================================
! Biogeochemistry history output
!
Expand All @@ -21,7 +20,7 @@ module ice_history_bgc
use icepack_intfc, only: icepack_query_tracer_flags, &
icepack_query_tracer_indices, icepack_query_parameters, &
icepack_query_parameters
use ice_domain_size, only: max_nstrm, n_aero, nblyr, &
use ice_domain_size, only: max_nstrm, n_aero, &
n_algae, n_dic, n_doc, n_don, n_zaero, n_fed, n_fep

implicit none
Expand Down Expand Up @@ -1730,8 +1729,6 @@ end subroutine init_hist_bgc_2D

subroutine init_hist_bgc_3Dc

use ice_broadcast, only: broadcast_scalar
use ice_broadcast, only: broadcast_scalar
use ice_calendar, only: nstreams
use ice_history_shared, only: tstr3Dc, tcstr, define_hist_field

Expand Down Expand Up @@ -1816,14 +1813,14 @@ subroutine accum_hist_bgc (iblk)
R_C2N, R_chl2N
use ice_blocks, only: block, get_block, nx_block, ny_block
use ice_domain, only: blocks_ice
use ice_domain_size, only: ncat, nblyr
use ice_domain_size, only: nblyr
use ice_flux, only: sss
use ice_flux_bgc, only: faero_atm, faero_ocn, flux_bio, flux_bio_ai, &
fzsal_ai, fzsal_g_ai
use ice_history_shared, only: n2D, a2D, a3Dc, n3Dccum, &
n3Dzcum, n3Dbcum, n3Dacum, a3Db, a3Da, &
use ice_history_shared, only: n2D, a2D, a3Dc, &
n3Dzcum, n3Dbcum, a3Db, a3Da, &
ncat_hist, accum_hist_field, nzblyr, nzalyr
use ice_state, only: trcrn, trcr, aicen, aice, vice, vicen
use ice_state, only: trcrn, trcr, aicen, aice, vicen

integer (kind=int_kind), intent(in) :: &
iblk ! block index
Expand Down
7 changes: 2 additions & 5 deletions cicecore/cicedynB/analysis/ice_history_drag.F90
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
! SVN:$Id: ice_history_drag.F90 1228 2017-05-23 21:33:34Z tcraig $
!=======================================================================

! 2013 module for form drag parameters
Expand All @@ -8,10 +7,9 @@ module ice_history_drag

use ice_kinds_mod
use ice_domain_size, only: max_nstrm
use ice_constants, only: c0, c1, c100, mps_to_cmpdy
use ice_constants, only: c0, c1
use ice_fileunits, only: nu_nml, nml_filename, &
get_fileunit, release_fileunit
use ice_fileunits, only: nu_diag
use ice_exit, only: abort_ice
use icepack_intfc, only: icepack_warnings_flush, icepack_warnings_aborted

Expand Down Expand Up @@ -230,8 +228,7 @@ end subroutine init_hist_drag_2D

subroutine accum_hist_drag (iblk)

use ice_history_shared, only: n2D, a2D, a3Dc, ncat_hist, &
accum_hist_field
use ice_history_shared, only: a2D, accum_hist_field
use ice_arrays_column, only: hfreebd, hdraft, hridge, distrdg, hkeel, &
dkeel, lfloe, dfloe, Cdn_atm, Cdn_atm_skin, Cdn_atm_floe, &
Cdn_atm_pond, Cdn_atm_rdg, Cdn_atm_ratio, Cdn_ocn_skin, &
Expand Down
1 change: 0 additions & 1 deletion cicecore/cicedynB/analysis/ice_history_mechred.F90
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
! SVN:$Id: ice_history_mechred.F90 1228 2017-05-23 21:33:34Z tcraig $
!=======================================================================

! Mechanical redistribution history output
Expand Down
1 change: 0 additions & 1 deletion cicecore/cicedynB/analysis/ice_history_pond.F90
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
! SVN:$Id: ice_history_pond.F90 1228 2017-05-23 21:33:34Z tcraig $
!=======================================================================

! Melt pond history output
Expand Down
Loading