Changeset 4955 for branches/2014/dev_MERGE_2014

Timestamp:

2014-12-02T14:32:57+01:00 (9 years ago)

Author:

cetlod

Message:

2014/dev_MERGE_2014 : fix on badly allocated lim3 variables

File:

• branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) (3 diffs)

branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90

@@ -123 +123 @@
       ierr(:) = 0
 
-      ALLOCATE( qsr_ice (jpi,jpj,jpl)                         ,     &
+#if defined key_lim3 || defined key_lim2
+      ALLOCATE( qns_ice (jpi,jpj,jpl) , qsr_ice (jpi,jpj,jpl) ,     &
          &      qla_ice (jpi,jpj,jpl) , dqla_ice(jpi,jpj,jpl) ,     &
+         &      dqns_ice(jpi,jpj,jpl) , tn_ice  (jpi,jpj,jpl) ,     &
+         &      alb_ice (jpi,jpj,jpl) ,                             &
          &      utau_ice(jpi,jpj)     , vtau_ice(jpi,jpj)     ,     &
-#if defined key_lim3 || defined key_cice
+         &      fr1_i0  (jpi,jpj)     , fr2_i0  (jpi,jpj)     ,     &
+#if defined key_lim3
          &      tatm_ice(jpi,jpj)     ,                             &
 #endif
-         &      STAT= ierr(1) )
+#if defined key_lim2
+         &      a_i(jpi,jpj,jpl)      ,                             &
+#endif
+         &      emp_ice(jpi,jpj)      , qemp_ice(jpi,jpj)     , STAT= ierr(1) )
+#endif
+
 #if defined key_cice
-      ALLOCATE( qlw_ice(jpi,jpj,1)    , wndi_ice(jpi,jpj)     , qatm_ice(jpi,jpj)     , &
+      ALLOCATE( qla_ice(jpi,jpj,1)    , qlw_ice(jpi,jpj,1)    , qsr_ice(jpi,jpj,1)    , &
+                wndi_ice(jpi,jpj)     , tatm_ice(jpi,jpj)     , qatm_ice(jpi,jpj)     , &
                 wndj_ice(jpi,jpj)     , nfrzmlt(jpi,jpj)      , ss_iou(jpi,jpj)       , &
                 ss_iov(jpi,jpj)       , fr_iu(jpi,jpj)        , fr_iv(jpi,jpj)        , &
@@ -141 +151 @@
          &                     STAT= ierr(2) )
       
-#else
-      ALLOCATE( fr1_i0(jpi,jpj)       , tn_ice (jpi,jpj,1)    , &
-         &      fr2_i0(jpi,jpj)       , alb_ice(jpi,jpj,1)    , &
-         &      emp_ice(jpi,jpj)      , qns_ice(jpi,jpj,1)    , dqns_ice(jpi,jpj,1)   , &
-         &      STAT= ierr(2) )
 #endif
          !
@@ -152 +157 @@
 #endif
          !
-#if defined key_lim2
-      ALLOCATE( a_i(jpi,jpj,1) , STAT=ierr(4) )
-#endif
-
 #if defined key_cice || defined key_lim2
       IF( lk_cpl )   ALLOCATE( ht_i(jpi,jpj,jpl) , ht_s(jpi,jpj,jpl) , STAT=ierr(5) )