Changeset 2708

Timestamp:

2011-03-28T09:55:33+02:00 (12 years ago)

Author:

smasson

Message:

dynamic memory: correction for coupled model

Location:

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

• sbccpl.F90 (modified) (7 diffs)
• sbcice_lim_2.F90 (modified) (1 diff)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -187 +187 @@
                 hsnif(jpi,jpj) , v_ice(jpi,jpj) , fr2_i0(jpi,jpj) , alb_ice(jpi,jpj,jpl) , STAT=ierr(2) )
 #endif
-      sbc_cpl_init_alloc = MAXVAL( ierr )
+      sbc_cpl_alloc = MAXVAL( ierr )
       IF( lk_mpp            )   CALL mpp_sum ( sbc_cpl_alloc )
       IF( sbc_cpl_alloc > 0 )   CALL ctl_warn('sbc_cpl_alloc: allocation of arrays failed')
@@ -207 +207 @@
       !!----------------------------------------------------------------------
       USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   zacs => wrk_2d_1 , zaos => wrk_2d_2   ! clear & overcast sky albedos
+      USE wrk_nemo, ONLY:   zacs => wrk_2d_3 , zaos => wrk_2d_4   ! clear & overcast sky albedos
       !!
       INTEGER, INTENT(in) ::   k_ice    ! ice management in the sbc (=0/1/2/3)
@@ -223 +223 @@
       !!---------------------------------------------------------------------
 
-      IF( wrk_in_use(2, 1,2) ) THEN
+      IF( wrk_in_use(2, 3,4) ) THEN
          CALL ctl_stop('sbc_cpl_init: requested workspace arrays unavailable')   ;   RETURN
       ENDIF
@@ -563 +563 @@
          &   CALL ctl_stop( 'sbc_cpl_init: diurnal cycle reconstruction (ln_dm2dc) needs daily couping for solar radiation' )
 
-      IF( wrk_not_released(2, 1,2) )   CALL ctl_stop('sbc_cpl_init: failed to release workspace arrays')
+      IF( wrk_not_released(2, 3,4) )   CALL ctl_stop('sbc_cpl_init: failed to release workspace arrays')
       !
    END SUBROUTINE sbc_cpl_init
@@ -1089 +1089 @@
       USE wrk_nemo, ONLY:   ztmp   => wrk_2d_2   ! temporary array
       USE wrk_nemo, ONLY:   zsnow  => wrk_2d_3   ! snow precipitation 
-      USE wrk_nemo, ONLY:   zicefr => wrk_3d_1   ! ice fraction 
+      USE wrk_nemo, ONLY:   zicefr => wrk_3d_4   ! ice fraction 
       !!
       REAL(wp), INTENT(in   ), DIMENSION(:,:,:) ::   p_frld     ! lead fraction                [0 to 1]
@@ -1110 +1110 @@
       !!----------------------------------------------------------------------
 
-      IF( wrk_in_use(2, 1,2,3) .OR. wrk_in_use(3, 1) ) THEN
+      IF( wrk_in_use(2, 1,2,3) .OR. wrk_in_use(3, 4) ) THEN
          CALL ctl_stop('sbc_cpl_ice_flx: requested workspace arrays unavailable')   ;   RETURN
       ENDIF
@@ -1232 +1232 @@
 
       IF( wrk_not_released(2, 1,2,3)  .OR.   &
-          wrk_not_released(3, 1)      )   CALL ctl_stop('sbc_cpl_ice_flx: failed to release workspace arrays')
+          wrk_not_released(3, 4)      )   CALL ctl_stop('sbc_cpl_ice_flx: failed to release workspace arrays')
       !
    END SUBROUTINE sbc_cpl_ice_flx

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim_2.F90

@@ -206 +206 @@
             &                                             emp_tot, emp_ice, dqns_ice, sprecip,   &
             !                                optional arguments, used only in 'mixed oce-ice' case
-            &                                             palbi = zalb_ice_cs, psst = sst_m, pist = sist )
+            &                                             palbi = zalb_ice_cs, psst = sst_m, pist = zsist )
 #endif
                            CALL lim_thd_2      ( kt )      ! Ice thermodynamics