Changeset 11479

Timestamp:

2019-08-28T17:24:26+02:00 (5 years ago)

Author:

dancopsey

Message:

Allocate space for a_i_last_couple after number of ice categories has been loaded.

Location:

NEMO/branches/UKMO/NEMO_4.0_fix_cpl_oce_only/src

Files:

• ICE/ice.F90 (modified) (2 diffs)
• OCE/SBC/sbccpl.F90 (modified) (3 diffs)

NEMO/branches/UKMO/NEMO_4.0_fix_cpl_oce_only/src/ICE/ice.F90

@@ -394 +394 @@
       INTEGER :: ice_alloc
       !
-      INTEGER :: ierr(15), ii
+      INTEGER :: ierr(16), ii
       !!-----------------------------------------------------------------
       ierr(:) = 0
@@ -429 +429 @@
 
       ii = ii + 1
+      ALLOCATE( a_i_last_couple(jpi,jpj,jpl) , STAT=ierr(ii) )
+
+      ii = ii + 1
       ALLOCATE( u_ice(jpi,jpj) , v_ice(jpi,jpj) ,                                   &
          &      vt_i (jpi,jpj) , vt_s (jpi,jpj) , at_i(jpi,jpj) , ato_i(jpi,jpj) ,  &

NEMO/branches/UKMO/NEMO_4.0_fix_cpl_oce_only/src/OCE/SBC/sbccpl.F90

@@ -223 +223 @@
       !!             ***  FUNCTION sbc_cpl_alloc  ***
       !!----------------------------------------------------------------------
-      INTEGER :: ierr(5)
+      INTEGER :: ierr(4)
       !!----------------------------------------------------------------------
       ierr(:) = 0
@@ -235 +235 @@
       !
       IF( .NOT. ln_apr_dyn ) ALLOCATE( ssh_ib(jpi,jpj), ssh_ibb(jpi,jpj), apr(jpi, jpj), STAT=ierr(4) ) 
-
-      ALLOCATE( a_i_last_couple(jpi,jpj,jpl) , STAT=ierr(5) )  
 
       sbc_cpl_alloc = MAXVAL( ierr )
@@ -2249 +2247 @@
                      & info == OASIS_SentOut  .OR. info == OASIS_ToRestOut ) THEN 
          IF ( sn_snd_thick%clcat == 'yes' ) THEN 
-           a_i_last_couple(:,:,:) = a_i(:,:,:) 
-         ENDIF 
-      ENDIF 
+           a_i_last_couple(:,:,1:jpl) = a_i(:,:,1:jpl)
+         ENDIF
+      ENDIF    
 
       IF( ssnd(jps_fice1)%laction ) THEN