Changeset 8029 for branches/2012/dev_v3_4_STABLE_2012/NEMOGCM

Timestamp:

2017-05-16T12:14:12+02:00 (7 years ago)

Author:

lovato

Message:

3.4 stable: apply macro selection as in 3.6_stable (#1528)

File:

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

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

@@ -88 +88 @@
    REAL(wp), DIMENSION(:,:), ALLOCATABLE ::   ssh_bkg, ssh_bkginc   ! Background sea surface height and its increment
    REAL(wp), DIMENSION(:,:), ALLOCATABLE ::   seaice_bkginc         ! Increment to the background sea ice conc
-#if defined key_cice
+#if defined key_cice && defined key_asminc
    REAL(wp), DIMENSION(:,:), ALLOCATABLE ::   ndaice_da             ! ice increment tendency into CICE
 #endif
@@ -371 +371 @@
       ALLOCATE( ssh_iau(jpi,jpj)      )
 #endif
-#if defined key_cice
+#if defined key_cice && defined key_asminc
       ALLOCATE( ndaice_da(jpi,jpj)      )
 #endif 
@@ -383 +383 @@
       ssh_iau(:,:)    = 0.0
 #endif
-#if defined key_cice
-      ndaice_da(jpi,jpj) = 0.0
+#if defined key_cice && defined key_asminc
+      ndaice_da(:,:) = 0.0
 #endif
       IF ( ( ln_trainc ).OR.( ln_dyninc ).OR.( ln_sshinc ).OR.( ln_seaiceinc ) ) THEN
@@ -1048 +1048 @@
 #endif
 
-#if defined key_cice
+#if defined key_cice && defined key_asminc
 
 ! Pass ice increment tendency into CICE
@@ -1061 +1061 @@
          ELSE
 
-#if defined key_cice
+#if defined key_cice && defined key_asminc
 
 ! Zero ice increment tendency into CICE
@@ -1109 +1109 @@
 #endif
 
-#if defined key_cice
+#if defined key_cice && defined key_asminc
 
 ! Pass ice increment tendency into CICE - is this correct?
@@ -1121 +1121 @@
          ELSE
 
-#if defined key_cice
+#if defined key_cice && defined key_asminc
 
 ! Zero ice increment tendency into CICE