Changeset 9657 for NEMO/trunk/src/OCE/BDY/bdydta.F90

Timestamp:

2018-05-28T12:19:58+02:00 (6 years ago)

Author:

clem

Message:

change nn_ice_lim and cn_ice_lim to nn_ice and cn_ice for BDY

File:

• NEMO/trunk/src/OCE/BDY/bdydta.F90 (modified) (6 diffs)

NEMO/trunk/src/OCE/BDY/bdydta.F90

@@ -180 +180 @@
 
 #if defined key_si3
-            IF( nn_ice_lim_dta(jbdy) == 0 ) THEN    ! set ice to initial values
+            IF( nn_ice_dta(jbdy) == 0 ) THEN    ! set ice to initial values
                ilen1(:) = nblen(:)
                IF( dta%ll_a_i ) THEN
@@ -350 +350 @@
                ENDIF
 #if defined key_si3
-               IF( cn_ice_lim(jbdy) /= 'none' .AND. nn_ice_lim_dta(jbdy) == 1 ) THEN
+               IF( cn_ice(jbdy) /= 'none' .AND. nn_ice_dta(jbdy) == 1 ) THEN
                   IF( nice_cat == 1 ) THEN ! case input cat = 1
                      CALL ice_var_itd ( bf(jfld_hti)%fnow(:,1,1), bf(jfld_hts)%fnow(:,1,1), bf(jfld_ai)%fnow(:,1,1), &
@@ -453 +453 @@
             &                , nn_tra_dta    (jbdy)    &
 #if defined key_si3
-            &                , nn_ice_lim_dta(jbdy)    &
+            &                , nn_ice_dta    (jbdy)    &
 #endif
                               )
@@ -474 +474 @@
          ENDIF
 #if defined key_si3
-         IF( cn_ice_lim(jbdy) /= 'none' .AND. nn_ice_lim_dta(jbdy) == 1  ) THEN
+         IF( cn_ice(jbdy) /= 'none' .AND. nn_ice_dta(jbdy) == 1  ) THEN
             nb_bdy_fld(jbdy) = nb_bdy_fld(jbdy) + 3
          ENDIF
@@ -615 +615 @@
 #if defined key_si3
             ! sea ice
-            IF( nn_ice_lim_dta(jbdy) == 1 ) THEN
+            IF( nn_ice_dta(jbdy) == 1 ) THEN
                ! Test for types of ice input (1cat or Xcat) 
                ! Build file name to find dimensions 
@@ -798 +798 @@
 
 #if defined key_si3
-         IF (cn_ice_lim(jbdy) /= 'none') THEN
-            IF( nn_ice_lim_dta(jbdy) == 0 ) THEN
+         IF (cn_ice(jbdy) /= 'none') THEN
+            IF( nn_ice_dta(jbdy) == 0 ) THEN
                ALLOCATE( dta_bdy(jbdy)%a_i(nblen(1),jpl) )
                ALLOCATE( dta_bdy(jbdy)%h_i(nblen(1),jpl) )