Changeset 4608 for trunk/NEMOGCM/NEMO/OPA_SRC/BDY

Timestamp:

2014-03-31T14:39:07+02:00 (10 years ago)

Author:

davestorkey

Message:

Bug fixes for BDY with LIM, see ticket #1288.

Location:

trunk/NEMOGCM/NEMO/OPA_SRC/BDY

Files:

• bdy_oce.F90 (modified) (1 diff)
• bdydta.F90 (modified) (3 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdy_oce.F90

@@ -105 +105 @@
 
 #if ( defined key_lim2 || defined key_lim3 )
-   CHARACTER(len=20), DIMENSION(jp_bdy) ::   nn_ice_lim       ! Choice of boundary condition for sea ice variables 
+   CHARACTER(len=20), DIMENSION(jp_bdy) ::   cn_ice_lim       ! Choice of boundary condition for sea ice variables 
    INTEGER, DIMENSION(jp_bdy)           ::   nn_ice_lim_dta   !: = 0 use the initial state as bdy dta ; 
                                                               !: = 1 read it in a NetCDF file

trunk/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90

@@ -379 +379 @@
                ENDIF
 #if defined key_lim3
-               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)
+               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)
                 CALL lim_cat_1D ( bf(jfld_hti)%fnow(:,1,1), bf(jfld_hts)%fnow(:,1,1), bf(jfld_ai)%fnow(:,1,1), &
                                   & dta_bdy(ib_bdy)%ht_i,     dta_bdy(ib_bdy)%ht_s,     dta_bdy(ib_bdy)%a_i     )
@@ -838 +838 @@
 
 #if defined key_lim2
-         IF (nn_ice_lim(ib_bdy) .gt. 0) THEN
+         IF (cn_ice_lim(ib_bdy) /= 'none') THEN
             IF( nn_ice_lim_dta(ib_bdy) .eq. 0 ) THEN
                ALLOCATE( dta_bdy(ib_bdy)%frld(nblen(1)) )
@@ -853 +853 @@
          ENDIF
 #elif defined key_lim3
-         IF (nn_ice_lim(ib_bdy) .gt. 0) THEN
+         IF (cn_ice_lim(ib_bdy) /= 'none') THEN
             IF( nn_ice_lim_dta(ib_bdy) .eq. 0 ) THEN
                ALLOCATE( dta_bdy(ib_bdy)%a_i (nblen(1),jpl) )