Skip to content

Commit

Permalink
add ice_dyn_vp module to CICE_InitMod
Browse files Browse the repository at this point in the history
  • Loading branch information
DeniseWorthen committed Oct 30, 2020
1 parent 2515f77 commit 41afe74
Showing 1 changed file with 15 additions and 14 deletions.
29 changes: 15 additions & 14 deletions cicecore/drivers/nuopc/cmeps/CICE_InitMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ subroutine cice_init
use ice_domain_size, only: ncat, nfsd
use ice_dyn_eap, only: init_eap, alloc_dyn_eap
use ice_dyn_shared, only: kdyn, init_dyn, alloc_dyn_shared
use ice_dyn_vp, only: init_vp
use ice_flux, only: init_coupler_flux, init_history_therm, &
init_history_dyn, init_flux_atm, init_flux_ocn, alloc_flux
use ice_forcing, only: init_forcing_ocn
Expand Down Expand Up @@ -162,8 +163,8 @@ subroutine cice_init
call faero_optics !initialize aerosol optical property tables
end if

! Initialize shortwave components using swdn from previous timestep
! if restarting. These components will be scaled to current forcing
! Initialize shortwave components using swdn from previous timestep
! if restarting. These components will be scaled to current forcing
! in prep_radiation.

if (trim(runtype) == 'continue' .or. restart) then
Expand Down Expand Up @@ -250,7 +251,7 @@ subroutine init_restart
if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
file=__FILE__, line=__LINE__)

if (trim(runtype) == 'continue') then
if (trim(runtype) == 'continue') then
! start from core restart file
call restartfile() ! given by pointer in ice_in
call calendar(time) ! update time parameters
Expand All @@ -261,17 +262,17 @@ subroutine init_restart
! call restartfile_v4 (ice_ic) ! CICE v4.1 binary restart file
!!! uncomment if EAP restart data exists
! if (kdyn == 2) call read_restart_eap
endif
endif

! tracers
! ice age tracer
if (tr_iage) then
! ice age tracer
if (tr_iage) then
if (trim(runtype) == 'continue') &
restart_age = .true.
if (restart_age) then
call read_restart_age
else
do iblk = 1, nblocks
do iblk = 1, nblocks
call init_age(trcrn(:,:,nt_iage,:,iblk))
enddo ! iblk
endif
Expand All @@ -282,7 +283,7 @@ subroutine init_restart
if (restart_FY) then
call read_restart_FY
else
do iblk = 1, nblocks
do iblk = 1, nblocks
call init_FY(trcrn(:,:,nt_FY,:,iblk))
enddo ! iblk
endif
Expand All @@ -293,7 +294,7 @@ subroutine init_restart
if (restart_lvl) then
call read_restart_lvl
else
do iblk = 1, nblocks
do iblk = 1, nblocks
call init_lvl(iblk,trcrn(:,:,nt_alvl,:,iblk), &
trcrn(:,:,nt_vlvl,:,iblk))
enddo ! iblk
Expand All @@ -306,7 +307,7 @@ subroutine init_restart
if (restart_pond_cesm) then
call read_restart_pond_cesm
else
do iblk = 1, nblocks
do iblk = 1, nblocks
call init_meltponds_cesm(trcrn(:,:,nt_apnd,:,iblk), &
trcrn(:,:,nt_hpnd,:,iblk))
enddo ! iblk
Expand All @@ -319,7 +320,7 @@ subroutine init_restart
if (restart_pond_lvl) then
call read_restart_pond_lvl
else
do iblk = 1, nblocks
do iblk = 1, nblocks
call init_meltponds_lvl(trcrn(:,:,nt_apnd,:,iblk), &
trcrn(:,:,nt_hpnd,:,iblk), &
trcrn(:,:,nt_ipnd,:,iblk), &
Expand All @@ -334,7 +335,7 @@ subroutine init_restart
if (restart_pond_topo) then
call read_restart_pond_topo
else
do iblk = 1, nblocks
do iblk = 1, nblocks
call init_meltponds_topo(trcrn(:,:,nt_apnd,:,iblk), &
trcrn(:,:,nt_hpnd,:,iblk), &
trcrn(:,:,nt_ipnd,:,iblk))
Expand All @@ -357,7 +358,7 @@ subroutine init_restart
if (restart_iso) then
call read_restart_iso
else
do iblk = 1, nblocks
do iblk = 1, nblocks
call init_isotope(trcrn(:,:,nt_isosno:nt_isosno+n_iso-1,:,iblk), &
trcrn(:,:,nt_isoice:nt_isoice+n_iso-1,:,iblk))
enddo ! iblk
Expand All @@ -369,7 +370,7 @@ subroutine init_restart
if (restart_aero) then
call read_restart_aero
else
do iblk = 1, nblocks
do iblk = 1, nblocks
call init_aerosol(trcrn(:,:,nt_aero:nt_aero+4*n_aero-1,:,iblk))
enddo ! iblk
endif ! .not. restart_aero
Expand Down

0 comments on commit 41afe74

Please sign in to comment.