Changeset 2626

Timestamp:

2011-02-27T17:41:49+01:00 (13 years ago)

Author:

gm

Message:

dynamic mem: #785 ; LIM_SRC_3 mpp compilation correct limthd.F90 ; LIM2 & 3: add a test of jpl/jpk in iceini

Location:

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO

Files:

• LIM_SRC_2/iceini_2.F90 (modified) (2 diffs)
• LIM_SRC_2/limwri_2.F90 (modified) (1 diff)
• LIM_SRC_3/iceini.F90 (modified) (1 diff)
• LIM_SRC_3/limthd.F90 (modified) (2 diffs)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90

@@ -18 +18 @@
    USE phycst           ! physical constants
    USE dom_oce          ! ocean domain
+   USE sbc_oce          ! surface boundary condition: ocean
+   USE sbc_ice          ! LIM2 surface boundary condition
    USE dom_ice_2        ! LIM2 ice domain
-   USE sbc_oce          ! surface boundary condition: ocean
-   USE sbc_ice          ! surface boundary condition: ice
+   USE par_ice_2        ! LIM2 parameters
    USE thd_ice_2        ! LIM2 thermodynamical variables
    USE limrhg           ! LIM2 rheology
@@ -66 +67 @@
       IF( lk_mpp    )   CALL mpp_sum( ierr )
       IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'ice_init_2 : unable to allocate ice arrays' )
+
+      !                                ! adequation jpk versus ice/snow layers
+      IF( jpl > jpk  .OR.  jplayersp1 > jpk  )   CALL ctl_stop( 'STOP',           &
+         &     'ice_init: the 3rd dimension of workspace arrays is too small.',   &
+         &     'use more ocean levels or less ice layers/categories.' )
 
       !                                ! Open the namelist file 

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/LIM_SRC_2/limwri_2.F90

@@ -79 +79 @@
       ALLOCATE( ndex51(jpij), zcmo(jpi,jpj,jpnoumax), STAT=lim_wri_alloc_2)
       !
-      IF( lk_mpp               )   CALL mpp_sum( lim_wri_alloc_2 )
+      IF( lk_mpp               )   CALL mpp_sum ( lim_wri_alloc_2 )
       IF( lim_wri_alloc_2 /= 0 )   CALL ctl_warn('lim_wri_alloc_2: failed to allocate array ndex51')
       !

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/LIM_SRC_3/iceini.F90

@@ -65 +65 @@
       IF( lk_mpp    )   CALL mpp_sum( ierr )
       IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'ice_init : unable to allocate ice arrays' )
-
-      IF( ierr > 0 ) THEN
-         WRITE(numout,*) 
-         WRITE(numout,*) 'ERROR: Allocation of memory failed in nemo_alloc'
-         IF( lk_mpp )   CALL mppstop()
-         STOP
-      END IF
-      !
+      !
+      !                                ! adequation jpk versus ice/snow layers/categories
+      IF( jpl   > jpk  .OR.  jpm    > jpk .OR.                                    &
+          jkmax > jpk  .OR.  nlay_s > jpk      )   CALL ctl_stop( 'STOP',         &
+         &     'ice_init: the 3rd dimension of workspace arrays is too small.',   &
+         &     'use more ocean levels or less ice/snow layers/categories.' )
+
       !                                ! Open the namelist file 
       CALL ctl_opn( numnam_ice, 'namelist_ice', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp )

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90

@@ -96 +96 @@
       IF( .NOT. wrk_use(2, 1) ) THEN
          CALL ctl_stop( 'lim_thd : requested workspace arrays unavailable' )   ;   RETURN
-      END IF
+      ENDIF
    
       !------------------------------------------------------------------------------!
@@ -246 +246 @@
          !------------------------------------------------------------------------------!
 
-         IF( lk_mpp )   CALL mpp_ini_ice( nbpb )
+         IF( lk_mpp )   CALL mpp_ini_ice( nbpb , numout )
 
          IF( nbpb > 0 ) THEN  ! If there is no ice, do nothing.