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

Revert head of develop to UWM code #90

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Revert head of develop to UWM code #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 cicecore/cicedyn/analysis/ice_history_shared.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ subroutine construct_filename(ncfile,suffix,ns)

! Check whether the filename is already in use.
! Same filename in multiple history streams leads to files being overwritten (not good).
! The current filename convention means we just have to check latest filename,
! The current filename convention means we just have to check latest filename,
! not all filenames ever generated because of use of current model date/time in filename.

! write(nu_diag,'(2a,i2,1x,a)') subname, 'debug ncfile= ',ns,trim(ncfile)
Expand Down
3 changes: 2 additions & 1 deletion cicecore/cicedyn/dynamics/ice_dyn_eap.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,8 @@ subroutine eap (dt)
do ij = 1, icellT(iblk)
i = indxTi(ij, iblk)
j = indxTj(ij, iblk)
call icepack_ice_strength(aice = aice (i,j, iblk), &
call icepack_ice_strength(ncat=ncat, &
aice = aice (i,j, iblk), &
vice = vice (i,j, iblk), &
aice0 = aice0 (i,j, iblk), &
aicen = aicen (i,j,:,iblk), &
Expand Down
6 changes: 4 additions & 2 deletions cicecore/cicedyn/dynamics/ice_dyn_evp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,8 @@ subroutine evp (dt)
do ij = 1, icellT(iblk)
i = indxTi(ij, iblk)
j = indxTj(ij, iblk)
call icepack_ice_strength(aice = aice (i,j, iblk), &
call icepack_ice_strength(ncat = ncat, &
aice = aice (i,j, iblk), &
vice = vice (i,j, iblk), &
aice0 = aice0 (i,j, iblk), &
aicen = aicen (i,j,:,iblk), &
Expand Down Expand Up @@ -594,7 +595,8 @@ subroutine evp (dt)
do ij = 1, icellT(iblk)
i = indxTi(ij, iblk)
j = indxTj(ij, iblk)
call icepack_ice_strength(aice = aice (i,j, iblk), &
call icepack_ice_strength(ncat = ncat, &
aice = aice (i,j, iblk), &
vice = vice (i,j, iblk), &
aice0 = aice0 (i,j, iblk), &
aicen = aicen (i,j,:,iblk), &
Expand Down
13 changes: 7 additions & 6 deletions cicecore/cicedyn/dynamics/ice_dyn_vp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,12 +386,13 @@ subroutine implicit_solver (dt)
do ij = 1, icellT(iblk)
i = indxTi(ij, iblk)
j = indxTj(ij, iblk)
call icepack_ice_strength (aice = aice (i,j, iblk), &
vice = vice (i,j, iblk), &
aice0 = aice0 (i,j, iblk), &
aicen = aicen (i,j,:,iblk), &
vicen = vicen (i,j,:,iblk), &
strength = strength(i,j, iblk))
call icepack_ice_strength (ncat, &
aice (i,j, iblk), &
vice (i,j, iblk), &
aice0 (i,j, iblk), &
aicen (i,j,:,iblk), &
vicen (i,j,:,iblk), &
strength(i,j, iblk))
enddo ! ij

enddo ! iblk
Expand Down
3 changes: 2 additions & 1 deletion cicecore/cicedyn/dynamics/ice_transport_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1739,7 +1739,8 @@ subroutine work_to_state (nx_block, ny_block, &
i = indxi(ij)
j = indxj(ij)

call icepack_compute_tracers(trcr_depend = trcr_depend(:), &
call icepack_compute_tracers(ntrcr = ntrcr, &
trcr_depend = trcr_depend(:), &
atrcrn = work (ij,narrays+1:narrays+ntrcr), &
aicen = aicen(i,j,n), &
vicen = vicen(i,j,n), &
Expand Down
15 changes: 7 additions & 8 deletions cicecore/cicedyn/general/ice_forcing.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5396,10 +5396,9 @@ subroutine get_wave_spec
if (wave_spec) then
! get hardwired frequency bin info and a dummy wave spectrum profile
! the latter is used if wave_spec_type == profile
call icepack_init_wave(nfreq = nfreq, &
wave_spectrum_profile = wave_spectrum_profile, &
wavefreq = wavefreq, &
dwavefreq = dwavefreq)
call icepack_init_wave(nfreq, &
wave_spectrum_profile, &
wavefreq, dwavefreq)

! read more realistic data from a file
if ((trim(wave_spec_type) == 'constant').OR.(trim(wave_spec_type) == 'random')) then
Expand Down Expand Up @@ -5482,10 +5481,10 @@ subroutine wave_spec_data
if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
file=__FILE__, line=__LINE__)

call icepack_init_wave(nfreq = nfreq, &
wave_spectrum_profile = wave_spectrum_profile, &
wavefreq = wavefreq, &
dwavefreq = dwavefreq)
call icepack_init_wave(nfreq, &
wave_spectrum_profile, &
wavefreq, dwavefreq)


!spec_file = trim(ocn_data_dir)//'/'//trim(wave_spec_file)
spec_file = trim(wave_spec_file)
Expand Down
5 changes: 4 additions & 1 deletion cicecore/cicedyn/general/ice_init.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3024,7 +3024,8 @@ subroutine init_state
enddo

if (tmask(i,j,iblk)) &
call icepack_aggregate(aicen = aicen(i,j,:,iblk), &
call icepack_aggregate(ncat = ncat, &
aicen = aicen(i,j,:,iblk), &
trcrn = trcrn(i,j,:,:,iblk), &
vicen = vicen(i,j,:,iblk), &
vsnon = vsnon(i,j,:,iblk), &
Expand All @@ -3033,6 +3034,7 @@ subroutine init_state
vice = vice (i,j, iblk), &
vsno = vsno (i,j, iblk), &
aice0 = aice0(i,j, iblk), &
ntrcr = ntrcr, &
trcr_depend = trcr_depend(:), &
trcr_base = trcr_base(:,:), &
n_trcr_strata = n_trcr_strata(:), &
Expand Down Expand Up @@ -3511,6 +3513,7 @@ subroutine set_state_var (nx_block, ny_block, &
Sprofile = salinz(i,j,:), &
Tprofile = Tmltz(i,j,:), &
Tsfc = Tsfc, &
nilyr = nilyr, nslyr = nslyr, &
qin = qin(:), qsn = qsn(:))

! surface temperature
Expand Down
Loading
Loading