Changeset 1953 for branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcmod.F90

Timestamp:

2010-06-24T17:27:10+02:00 (14 years ago)

Author:

acc

Message:

ticket #684 step 3: Add in changes from the trunk between revisions 1784 and 1821. No conflicts so far

File:

• branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) (1 diff)

branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -85 +85 @@
 !!gm here no overwrite, test all option via namelist change: require more incore memory
 !!gm  IF( lk_sbc_cpl       ) THEN   ;   ln_cpl      = .TRUE.   ;   ELSE   ;   ln_cpl      = .FALSE.   ;   ENDIF
-#if defined key_agrif
+
       IF ( Agrif_Root() ) THEN
-#endif
         IF( lk_lim2 )            nn_ice      = 2
         IF( lk_lim3 )            nn_ice      = 3
-#if defined key_agrif
-      ENDIF
-#endif
+      ENDIF
+      !
       IF( cp_cfg == 'gyre' ) THEN
           ln_ana      = .TRUE.