Changeset 3784 for branches/2012

Timestamp:

2013-02-10T08:27:33+01:00 (11 years ago)

Author:

gm

Message:

dev_v3_4_STABLE_2012: #1046 : bug correction to compile LIM3 with ASM

File:

• branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90 (modified) (5 diffs)

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

@@ -35 +35 @@
    USE in_out_manager   ! I/O manager
    USE lib_mpp          ! MPP library
-#if defined key_lim3
-   USE ice              ! LIM3
-#endif
 #if defined key_lim2
    USE ice_2            ! LIM2
@@ -985 +982 @@
       REAL(wp) :: zincwgt  ! IAU weight for current time step
 
-#if defined key_lim3 || defined key_lim2
+#if defined key_lim2
       REAL(wp), DIMENSION(jpi,jpj) :: zofrld, zohicif, zseaicendg, zhicifinc  ! LIM
       REAL(wp) :: zhicifmin=0.5_wp      ! ice minimum depth in metres
@@ -1011 +1008 @@
             ENDIF
 
-#if defined key_lim3 || defined key_lim2
+#if defined key_lim2
 
             zofrld(:,:)=frld(:,:)
@@ -1070 +1067 @@
             neuler = 0                    ! Force Euler forward step
 
-#if defined key_lim3 || defined key_lim2
+#if defined key_lim2
 
             zofrld(:,:)=frld(:,:)
@@ -1120 +1117 @@
          ENDIF
 
-!#if defined key_lim3 || defined key_lim2 || defined key_cice
+!#if defined key_lim2 || defined key_cice
 !
 !            IF (ln_seaicebal ) THEN