Skip to content

Add NUOPC cap and rearrange driver directory #376

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

Merged
apcraig merged 12 commits into from
Nov 2, 2019
Merged

Add NUOPC cap and rearrange driver directory #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
eba8c60
NUOPC branch
dabail10 Oct 3, 2019
52d2b10
initial CICE6 port to CESM+NUOPC
apcraig Oct 23, 2019
b54bca9
clean up nu_diag initialization due to complexity added by nuopc cap
apcraig Oct 25, 2019
2c4ffa0
add nu_diag_set flag to work around the nu_diag setting in the nuopc cap
apcraig Oct 25, 2019
659aac8
update cice driver directories
apcraig Oct 28, 2019
399375c
update documentation
apcraig Oct 29, 2019
7358329
update documentation
apcraig Oct 29, 2019
8e0dfee
update documentation
apcraig Oct 29, 2019
a9e4c7f
update documentation
apcraig Oct 29, 2019
1de34fe
fix minor bug in cice.setup that affects settings parsing without fin…
apcraig Oct 29, 2019
05b9140
update documentation
apcraig Oct 29, 2019
65d28a8
rename drivers/subroutine to drivers/direct and update documentation
apcraig Oct 30, 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
2 changes: 1 addition & 1 deletion cice.setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ EOF2

cat ${ICE_SCRIPTS}/options/set_env.${name} >> ${fsmods}

cat >> ${fimods} << EOF2
cat >> ${fsmods} << EOF2

EOF2

Expand Down
18 changes: 12 additions & 6 deletions cicecore/cicedynB/general/ice_init.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module ice_init
use ice_communicate, only: my_task, master_task, ice_barrier
use ice_constants, only: c0, c1, c2, c3, p2, p5
use ice_exit, only: abort_ice
use ice_fileunits, only: nu_nml, nu_diag, nml_filename, diag_type, &
use ice_fileunits, only: nu_nml, nu_diag, nu_diag_set, nml_filename, diag_type, &
ice_stdout, get_fileunit, release_fileunit, bfbflag, flush_fileunit, &
ice_IOUnitsMinUnit, ice_IOUnitsMaxUnit
#ifdef CESMCOUPLED
Expand Down Expand Up @@ -466,11 +466,17 @@ subroutine input_data
history_file = trim(runid) // ".cice" // trim(inst_suffix) //".h"
restart_file = trim(runid) // ".cice" // trim(inst_suffix) //".r"
incond_file = trim(runid) // ".cice" // trim(inst_suffix) //".i"
inquire(file='ice_modelio.nml'//trim(inst_suffix),exist=exists)
if (exists) then
call get_fileUnit(nu_diag)
call shr_file_setIO('ice_modelio.nml'//trim(inst_suffix),nu_diag)
end if
! Note by tcraig - this if test is needed because the nuopc cap sets
! nu_diag before this routine is called. This creates a conflict.
! In addition, in the nuopc cap, shr_file_setIO will fail if the
! needed namelist is missing (which it is in the CIME nuopc implementation)
if (.not. nu_diag_set) then
inquire(file='ice_modelio.nml'//trim(inst_suffix),exist=exists)
if (exists) then
call get_fileUnit(nu_diag)
call shr_file_setIO('ice_modelio.nml'//trim(inst_suffix),nu_diag)
end if
endif
else
! each task gets unique ice log filename when if test is true, for debugging
if (1 == 0) then
Expand Down
Loading