Changeset 3184 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90

Timestamp:

2011-11-25T16:42:54+01:00 (12 years ago)

Author:

cetlod

Message:

New dynamic allocation in NST modules

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90 (modified) (7 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90

@@ -27 +27 @@
    USE agrif_opa_sponge
    USE lib_mpp
+   USE wrk_nemo_2
 
    IMPLICIT NONE
@@ -47 +48 @@
       !!                  ***  ROUTINE Agrif_Tra  ***
       !!----------------------------------------------------------------------
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY: wrk_4d_1
       !!
       INTEGER  ::   ji, jj, jk, jn   ! dummy loop indices
@@ -58 +57 @@
       IF( Agrif_Root() )   RETURN
 
-      ztsa => wrk_4d_1 
-      IF( wrk_in_use(4, 1) )THEN
-         CALL ctl_stop('agrif_tra: requested workspace arrays unavailable.')
-         RETURN
-      END IF
+      CALL wrk_alloc( jpi, jpj, jpk, jpts, ztsa ) 
 
       Agrif_SpecialValue    = 0.e0
@@ -159 +154 @@
       ENDIF
       !
-      IF( wrk_not_released(4, 1) ) THEN
-         CALL ctl_stop('agrif_tra: failed to release workspace arrays.')
-      ENDIF
+      CALL wrk_dealloc( jpi, jpj, jpk, jpts, ztsa ) 
       !
    END SUBROUTINE Agrif_tra
@@ -170 +163 @@
       !!                  ***  ROUTINE Agrif_DYN  ***
       !!----------------------------------------------------------------------  
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY: wrk_2d_4, wrk_2d_5
-      USE wrk_nemo, ONLY: wrk_2d_6, wrk_2d_7
-      USE wrk_nemo, ONLY: wrk_3d_1, wrk_3d_2
       !! 
       INTEGER, INTENT(in) ::   kt
@@ -187 +176 @@
       IF( Agrif_Root() )   RETURN
 
-      spgu1  => wrk_2d_4 ; spgv1 => wrk_2d_5
-      zua2d  => wrk_2d_6 ; zva2d => wrk_2d_7
-      zua  => wrk_3d_1 ; zva => wrk_3d_2
-      IF( wrk_in_use(2, 4,5,6,7) .OR. wrk_in_use(3, 1,2) )THEN
-         CALL ctl_stop('agrif_dyn: requested workspace arrays unavailable.')
-         RETURN
-      END IF
+      CALL wrk_alloc( jpi, jpj, spgv1, spgu1, zua2d, zva2d )
+      CALL wrk_alloc( jpi, jpj, jpk, zua, zva )
 
       zrhox = Agrif_Rhox()
@@ -506 +490 @@
       ENDIF
       !
-      IF( wrk_not_released(3, 1,2) .OR. wrk_not_released(2, 4,5,6,7)) THEN
-         CALL ctl_stop('agrif_dyn: failed to release workspace arrays.')
-      ENDIF
+      CALL wrk_dealloc( jpi, jpj, spgv1, spgu1, zua2d, zva2d )
+      CALL wrk_dealloc( jpi, jpj, jpk, zua, zva )
       !
    END SUBROUTINE Agrif_dyn