Changeset 4608
- Timestamp:
- 2014-03-31T14:39:07+02:00 (10 years ago)
- Location:
- trunk/NEMOGCM/NEMO/OPA_SRC/BDY
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90
r4354 r4608 105 105 106 106 #if ( defined key_lim2 || defined key_lim3 ) 107 CHARACTER(len=20), DIMENSION(jp_bdy) :: nn_ice_lim ! Choice of boundary condition for sea ice variables107 CHARACTER(len=20), DIMENSION(jp_bdy) :: cn_ice_lim ! Choice of boundary condition for sea ice variables 108 108 INTEGER, DIMENSION(jp_bdy) :: nn_ice_lim_dta !: = 0 use the initial state as bdy dta ; 109 109 !: = 1 read it in a NetCDF file -
trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90
r4354 r4608 379 379 ENDIF 380 380 #if defined key_lim3 381 IF( .NOT. ll_bdylim3 .AND. nn_ice_lim(ib_bdy) > 0.AND. nn_ice_lim_dta(ib_bdy) == 1 ) THEN ! bdy ice input (case input is lim2 type)381 IF( .NOT. ll_bdylim3 .AND. cn_ice_lim(ib_bdy) /= 'none' .AND. nn_ice_lim_dta(ib_bdy) == 1 ) THEN ! bdy ice input (case input is lim2 type) 382 382 CALL lim_cat_1D ( bf(jfld_hti)%fnow(:,1,1), bf(jfld_hts)%fnow(:,1,1), bf(jfld_ai)%fnow(:,1,1), & 383 383 & dta_bdy(ib_bdy)%ht_i, dta_bdy(ib_bdy)%ht_s, dta_bdy(ib_bdy)%a_i ) … … 838 838 839 839 #if defined key_lim2 840 IF ( nn_ice_lim(ib_bdy) .gt. 0) THEN840 IF (cn_ice_lim(ib_bdy) /= 'none') THEN 841 841 IF( nn_ice_lim_dta(ib_bdy) .eq. 0 ) THEN 842 842 ALLOCATE( dta_bdy(ib_bdy)%frld(nblen(1)) ) … … 853 853 ENDIF 854 854 #elif defined key_lim3 855 IF ( nn_ice_lim(ib_bdy) .gt. 0) THEN855 IF (cn_ice_lim(ib_bdy) /= 'none') THEN 856 856 IF( nn_ice_lim_dta(ib_bdy) .eq. 0 ) THEN 857 857 ALLOCATE( dta_bdy(ib_bdy)%a_i (nblen(1),jpl) )
Note: See TracChangeset
for help on using the changeset viewer.