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 from Consortium Main Oct 8, 2022 #125f03a #11

Merged
merged 5 commits into from
Oct 11, 2022
Merged

Update from Consortium Main Oct 8, 2022 #125f03a #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c7b9b5
icepack_therm_shared: correct 'Tair' units in declaration comment (#399)
phil-blain Aug 23, 2022
460ddf8
dEdd aerosol fixes (#400)
apcraig Sep 28, 2022
124f03a
close nu_diag (#403)
eclare108213 Oct 7, 2022
6b7b63a
Merge branch 'main' of https://github.com/cice-consortium/icepack int…
apcraig Oct 8, 2022
635f1c4
Merge branch 'cice-consortium/E3SM-icepack-initial-integration' into …
apcraig Oct 11, 2022
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 columnphysics/icepack_therm_shared.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ subroutine icepack_init_trcr(Tair, Tf, &
nslyr ! number of snow layers

real (kind=dbl_kind), intent(in) :: &
Tair, & ! air temperature (C)
Tair, & ! air temperature (K)
Tf ! freezing temperature (C)

real (kind=dbl_kind), dimension(:), intent(in) :: &
Expand Down
3 changes: 3 additions & 0 deletions configuration/driver/icedrv_InitMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ end subroutine icedrv_initialize
subroutine init_restart

use icedrv_calendar, only: time, calendar
use icedrv_constants, only: nu_restart
use icepack_intfc, only: icepack_aggregate
use icedrv_domain_size, only: ncat, max_ntrcr, nx
use icedrv_init, only: ice_ic
Expand Down Expand Up @@ -225,6 +226,8 @@ subroutine init_restart
if (restart) call read_restart_bgc ! complete BGC initialization
endif

close (nu_restart)

!-----------------------------------------------------------------
! aggregate tracers
!-----------------------------------------------------------------
Expand Down
10 changes: 9 additions & 1 deletion configuration/driver/icedrv_MAIN.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@ program icedrv

use icedrv_InitMod
use icedrv_RunMod
use icedrv_constants, only: ice_stdout, nu_diag
use icedrv_constants, only: ice_stdout, nu_diag, nu_diag_out
use icedrv_domain_size, only: nx
use icepack_intfc, only: icepack_warnings_flush, icepack_warnings_aborted
use icedrv_system, only: icedrv_system_abort

implicit none

integer n
character(len=*), parameter :: subname='(icedrv)'

!-----------------------------------------------------------------
Expand All @@ -53,6 +55,12 @@ program icedrv

write(ice_stdout, *) "ICEPACK COMPLETED SUCCESSFULLY "

close (ice_stdout)
close (nu_diag)
do n = 1, nx
close (nu_diag_out+n-1)
enddo

end program icedrv

!=======================================================================
2 changes: 2 additions & 0 deletions configuration/driver/icedrv_forcing.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,6 +1126,8 @@ subroutine ice_open_clos
read(nu_open_clos,*) xtime, open_data(i), clos_data(i)
enddo

close (nu_open_clos)

end subroutine ice_open_clos

!=======================================================================
Expand Down
1 change: 1 addition & 0 deletions configuration/driver/icedrv_restart.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ subroutine restartfile (ice_ic)
if (tr_aero) call read_restart_aero() ! ice aerosols
if (tr_brine) call read_restart_hbrine ! brine height
if (tr_fsd) call read_restart_fsd() ! floe size distribution

!-----------------------------------------------------------------
! Ensure ice is binned in correct categories
! (should not be necessary unless restarting from a run with
Expand Down
7 changes: 7 additions & 0 deletions configuration/scripts/options/set_nml.modal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
tr_lvl = .true.
tr_pond_topo = .false.
tr_pond_lvl = .true.
tr_aero = .true.
modal_aero = .true.
rfracmin = 0.15
rfracmax = 1.0
9 changes: 0 additions & 9 deletions configuration/scripts/options/set_nml.pondcesm
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions configuration/scripts/tests/base_suite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ smoke col 1x1 debug,run1year,fsd1
smoke col 1x1 debug,run1year,snw30percent,snwgrain
smoke col 1x1 debug,run1year,snwitdrdg
smoke col 1x1 debug,run1year,calcdragio
smoke col 1x1 debug,run1year,modal
restart col 1x1 debug
restart col 1x1 diag1
restart col 1x1 pondlvl
Expand All @@ -35,4 +36,5 @@ restart col 1x1 alt04
restart col 1x1 dyn
restart col 1x1 fsd12
restart col 1x1 snwitdrdg,snwgrain
restart col 1x1 modal

8 changes: 8 additions & 0 deletions configuration/scripts/tests/travis_suite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,15 @@ restart col 1x1 diag1
restart col 1x1 pondlvl
restart col 1x1 pondtopo
restart col 1x1 bgcispol
restart col 1x1 zsal
restart col 1x1 thermo1
restart col 1x1 swccsm3
restart col 1x1 isotope
restart col 1x1 alt01
restart col 1x1 alt02
restart col 1x1 alt03
restart col 1x1 alt04
restart col 1x1 dyn
restart col 1x1 fsd12
restart col 1x1 snwitdrdg,snwgrain
restart col 1x1 modal