Changeset 9654 for NEMO/trunk
- Timestamp:
- 2018-05-28T11:08:53+02:00 (6 years ago)
- Location:
- NEMO/trunk/src/OCE
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/trunk/src/OCE/IOM/restart.F90
r9598 r9654 20 20 USE oce ! ocean dynamics and tracers 21 21 USE dom_oce ! ocean space and time domain 22 USE sbc_ice ! only lk_ lim322 USE sbc_ice ! only lk_si3 23 23 USE phycst ! physical constants 24 24 USE eosbn2 ! equation of state (eos bn2 routine) -
NEMO/trunk/src/OCE/SBC/sbc_ice.F90
r9598 r9654 11 11 #if defined key_si3 || defined key_cice 12 12 !!---------------------------------------------------------------------- 13 !! 'key_si3' or 'key_cice' : LIM-3 or CICE sea-ice model13 !! 'key_si3' or 'key_cice' : SI3 or CICE sea-ice model 14 14 !!---------------------------------------------------------------------- 15 15 USE par_oce ! ocean parameters … … 30 30 31 31 # if defined key_si3 32 LOGICAL , PUBLIC, PARAMETER :: lk_ lim3= .TRUE. !: LIM-3 ice model32 LOGICAL , PUBLIC, PARAMETER :: lk_si3 = .TRUE. !: LIM-3 ice model 33 33 LOGICAL , PUBLIC, PARAMETER :: lk_cice = .FALSE. !: no CICE 34 34 CHARACTER(len=1), PUBLIC, PARAMETER :: cp_ice_msh = 'C' !: 'C'-grid ice-velocity 35 35 # endif 36 36 # if defined key_cice 37 LOGICAL , PUBLIC, PARAMETER :: lk_ lim3= .FALSE. !: no LIM-337 LOGICAL , PUBLIC, PARAMETER :: lk_si3 = .FALSE. !: no LIM-3 38 38 LOGICAL , PUBLIC, PARAMETER :: lk_cice = .TRUE. !: CICE ice model 39 39 CHARACTER(len=1), PUBLIC :: cp_ice_msh = 'F' !: 'F'-grid ice-velocity … … 157 157 #else 158 158 !!---------------------------------------------------------------------- 159 !! Default option NO LIM3 or CICE sea-ice model159 !! Default option NO SI3 or CICE sea-ice model 160 160 !!---------------------------------------------------------------------- 161 161 USE lib_mpp ! MPP library … … 167 167 PUBLIC sbc_ice_alloc ! 168 168 169 LOGICAL , PUBLIC, PARAMETER :: lk_ lim3= .FALSE. !: no LIM-3 ice model169 LOGICAL , PUBLIC, PARAMETER :: lk_si3 = .FALSE. !: no LIM-3 ice model 170 170 LOGICAL , PUBLIC, PARAMETER :: lk_cice = .FALSE. !: no CICE ice model 171 171 CHARACTER(len=1), PUBLIC, PARAMETER :: cp_ice_msh = '-' !: no grid ice-velocity -
NEMO/trunk/src/OCE/SBC/sbcmod.F90
r9598 r9654 117 117 #if defined key_agrif 118 118 IF( Agrif_Root() ) THEN ! AGRIF zoom (cf r1242: possibility to run without ice in fine grid) 119 IF( lk_ lim3) nn_ice = 2119 IF( lk_si3 ) nn_ice = 2 120 120 IF( lk_cice ) nn_ice = 3 121 121 ENDIF 122 122 #else 123 IF( lk_ lim3) nn_ice = 2123 IF( lk_si3 ) nn_ice = 2 124 124 IF( lk_cice ) nn_ice = 3 125 125 #endif
Note: See TracChangeset
for help on using the changeset viewer.