Changeset 3263 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

Timestamp:

2012-01-17T15:10:34+01:00 (12 years ago)

Author:

rblod

Message:

Correct cpp name for key_ice_lim see ticket #909

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) (5 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

@@ -1015 +1015 @@
          & un, vn,  &
          & sshn
-#if defined key_ice_lim
+#if defined key_lim2 || defined key_lim3
       USE ice, ONLY : &                     ! LIM Ice model variables
          & frld
@@ -1031 +1031 @@
       INTEGER :: jveloset               ! velocity profile data loop variable
       INTEGER :: jvar                   ! Variable number    
-#if ! defined key_ice_lim
+#if ! defined key_lim2 && ! defined key_lim3
       REAL(wp), POINTER, DIMENSION(:,:) :: frld   
 #endif
       CHARACTER(LEN=20) :: datestr=" ",timestr=" "
  
-#if ! defined key_ice_lim
+#if ! defined key_lim2 && ! defined key_lim3
       CALL wrk_alloc(jpi,jpj,frld) 
 #endif
@@ -1051 +1051 @@
       ! No LIM => frld == 0.0_wp
       !-----------------------------------------------------------------------
-#if ! defined key_ice_lim
+#if ! defined key_lim2 && ! defined key_lim3
       frld(:,:) = 0.0_wp
 #endif
@@ -1099 +1099 @@
       ENDIF
 
-#if defined key_ice_lim
+#if defined key_lim2 || defined key_lim3
       IF ( ln_seaice ) THEN
          DO jseaiceset = 1, nseaicesets
@@ -1119 +1119 @@
       ENDIF
 
-#if ! defined key_ice_lim
+#if ! defined key_lim2 && ! defined key_lim3
       CALL wrk_dealloc(jpi,jpj,frld) 
 #endif