Skip to content

Commit

Permalink
Allow for coupling to both nemo and hycom (CICE-Consortium#474)
Browse files Browse the repository at this point in the history
* allow for nemo-cice coupling in same driver

Co-authored-by: Tony Craig <apcraig@users.noreply.github.com>
  • Loading branch information
TillRasmussen and apcraig authored Jun 24, 2020
1 parent 3fedc78 commit f532dd9
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions cicecore/drivers/nuopc/dmi/CICE_InitMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,12 @@ subroutine cice_init(mpi_comm)
call icepack_warnings_flush(nu_diag)
if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
file=__FILE__, line=__LINE__)

! call calendar(time) ! determine the initial date

#ifndef CICE_DMI
call calendar(time) ! determine the initial date
#endif
#ifndef CICE_IN_NEMO
call init_forcing_ocn(dt) ! initialize sss and sst from data
#endif
call init_state ! initialize the ice state
call init_transport ! initialize horizontal transport
call ice_HaloRestore_init ! restored boundary conditions
Expand Down Expand Up @@ -216,7 +218,9 @@ subroutine cice_init(mpi_comm)
! coupler communication or forcing data initialization
!--------------------------------------------------------------------

#ifndef CICE_IN_NEMO
call init_forcing_atmo ! initialize atmospheric forcing (standalone)
#endif

#ifndef coupled
#ifndef CESMCOUPLED
Expand Down

0 comments on commit f532dd9

Please sign in to comment.