Changeset 3185 for branches/2011/dev_NEMO_MERGE_2011

Timestamp:

2011-11-27T08:53:50+01:00 (12 years ago)

Author:

smasson

Message:

dev_NEMO_MERGE_2011: last changes before removing old wrk_nemo

Location:

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC

Files:

• DIA/diadct.F90 (modified) (1 diff)
• DOM/domwri.F90 (modified) (1 diff)
• LBC/lib_mpp.F90 (modified) (3 diffs)
• OBS/obs_readmdt.F90 (modified) (3 diffs)
• TRD/trdvor.F90 (modified) (2 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90

@@ -240 +240 @@
      IF( lk_mpp )THEN
         itotal = nb_sec_max*nb_type_class*nb_class_max
-        CALL wrk_alloc( itotal                                , zwork ) 
-        CALL wrk_alloc( nb_sec_max,nb_type_class,nb_class_max , zsum  )
+        CALL wrk_dealloc( itotal                                , zwork ) 
+        CALL wrk_dealloc( nb_sec_max,nb_type_class,nb_class_max , zsum  )
      ENDIF    
 

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DOM/domwri.F90

@@ -308 +308 @@
       puniq(nldi:nlei,nldj:nlej) = REAL( COUNT( lldbl(nldi:nlei,nldj:nlej,:), dim = 3 ) , wp )
       !
-      CALL wrk_alloc( jpi, jpj, ztstref )
+      CALL wrk_dealloc( jpi, jpj, ztstref )
       !
       IF( nn_timing == 1 )  CALL timing_stop('dom_uniq')

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

@@ -1771 +1771 @@
       !!
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   ztab => wrk_2d_1
+      USE wrk_nemo_2      ! Memory allocation
       !
       INTEGER , INTENT(in   )                     ::   kd1, kd2   ! starting and ending indices
@@ -1789 +1788 @@
       INTEGER ::   ml_req1, ml_req2, ml_err    ! for key_mpi_isend
       INTEGER ::   ml_stat(MPI_STATUS_SIZE)    ! for key_mpi_isend
-      !!----------------------------------------------------------------------
-
-      IF( wrk_in_use(2, 1) ) THEN
-         WRITE(kumout, cform_err)
-         WRITE(kumout,*) 'mppobc : requested workspace array unavailable'
-         CALL mppstop
-      ENDIF
+      REAL(wp), POINTER, DIMENSION(:,:) ::   ztab   ! temporary workspace
+      !!----------------------------------------------------------------------
+
+      CALL wrk_alloc( jpi,jpj, ztab )
 
       ! boundary condition initialization
@@ -1946 +1942 @@
       END DO
       !
-      IF( wrk_not_released(2, 1) ) THEN
-         WRITE(kumout, cform_err)
-         WRITE(kumout,*) 'mppobc : failed to release workspace array'
-         CALL mppstop
-      ENDIF
+      CALL wrk_dealloc( jpi,jpj, ztab )
       !
    END SUBROUTINE mppobc

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

@@ -188 +188 @@
       !! ** Action  : 
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   zpromsk => wrk_2d_3
-      !
       REAL(wp), DIMENSION(jpi,jpj), INTENT(inout) ::   mdt     ! MDT used on the model grid
       REAL(wp)                    , INTENT(in   ) ::   zfill 
@@ -196 +193 @@
       INTEGER  :: ji, jj
       REAL(wp) :: zdxdy, zarea, zeta1, zeta2, zcorr_mdt, zcorr_bcketa, zcorr     ! local scalar
+      REAL(wp), POINTER, DIMENSION(:,:) :: zpromsk
       CHARACTER(LEN=14), PARAMETER ::   cpname = 'obs_offset_mdt'
       !!----------------------------------------------------------------------
 
-      IF( wrk_in_use(2, 3) ) THEN
-         CALL ctl_stop('obs_offset_mdt: requested workspace array unavailable')   ;   RETURN
-      ENDIF
+      CALL wrk_alloc( jpi,jpj, zpromsk )
 
       !  Initialize the local mask, for domain projection 
@@ -263 +259 @@
       IF ( nmsshc == 2 ) WRITE(numout,*) '           User defined MSSH correction' 
 
-      IF( wrk_not_released(2, 3) )   CALL ctl_stop('obs_offset_mdt: failed to release workspace array')
+      CALL wrk_dealloc( jpi,jpj, zpromsk )
       !
    END SUBROUTINE obs_offset_mdt

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRD/trdvor.F90

@@ -205 +205 @@
       !
       INTEGER ::   ji, jj, jk   ! dummy loop indices
-      REAL(wp), POINTER, DIMENSION(:,:  ) :: zubet  , zvbet  ! Beta.V   
-      REAL(wp), POINTER, DIMENSION(:,:,:) :: zudpvor, zvdpvor  ! total cmulative trends
+      REAL(wp), POINTER, DIMENSION(:,:) :: zubet  , zvbet    ! Beta.V   
+      REAL(wp), POINTER, DIMENSION(:,:) :: zudpvor, zvdpvor  ! total cmulative trends
       !!----------------------------------------------------------------------
      
-      CALL wrk_alloc( jpi, jpj,      zubet  , zvbet   )                                   
-      CALL wrk_alloc( jpi, jpj, jpk, zudpvor, zvdpvor )                                   
+      CALL wrk_alloc( jpi,jpj, zubet, zvbet, zudpvor, zvdpvor )                                   
 
       ! Initialization
@@ -274 +273 @@
       ENDIF
       !
-      CALL wrk_dealloc( jpi, jpj,      zubet  , zvbet   )                                   
-      CALL wrk_dealloc( jpi, jpj, jpk, zudpvor, zvdpvor )                                   
+      CALL wrk_dealloc( jpi,jpj, zubet, zvbet, zudpvor, zvdpvor )                                   
       !
    END SUBROUTINE trd_vor_zint_3d