Changeset 3184 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.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_update.F90 (modified) (7 diffs)

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

@@ -9 +9 @@
    USE in_out_manager  ! I/O manager
    USE lib_mpp
+   USE wrk_nemo_2
+
    IMPLICIT NONE
    PRIVATE
@@ -28 +30 @@
       !!   *** ROUTINE Agrif_Update_Tra ***
       !!---------------------------------------------
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY: wrk_4d_1
       !!
       INTEGER, INTENT(in) :: kt
@@ -37 +37 @@
       IF((Agrif_NbStepint() .NE. (Agrif_irhot()-1)).AND.(kt /= 0)) RETURN
 #if defined TWO_WAY
-      IF( wrk_in_use(4, 1) ) THEN
-         CALL ctl_stop('agrif_update_tra: ERROR: requested workspace arrays unavailable')
-         RETURN
-      END IF
-      ztab => wrk_4d_1
+      CALL wrk_alloc( jpi, jpj, jpk, jpts, ztab )
 
       Agrif_UseSpecialValueInUpdate = .TRUE.
@@ -54 +50 @@
       Agrif_UseSpecialValueInUpdate = .FALSE.
 
-      IF( wrk_not_released(4, 1) ) THEN
-         CALL ctl_stop('Agrif_Update_Tra: ERROR: failed to release workspace arrays')
-      END IF
+      CALL wrk_dealloc( jpi, jpj, jpk, jpts, ztab )
 #endif
 
@@ -65 +59 @@
       !!   *** ROUTINE Agrif_Update_Dyn ***
       !!---------------------------------------------
-      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY: wrk_2d_1
-      USE wrk_nemo, ONLY: wrk_3d_1
       !!
       INTEGER, INTENT(in) :: kt
@@ -76 +67 @@
       IF ((Agrif_NbStepint() .NE. (Agrif_irhot()-1)).AND.(kt /= 0)) Return
 #if defined TWO_WAY
-      ztab => wrk_3d_1 ; ztab2d => wrk_2d_1
-      IF( ( wrk_in_use(2, 1)) .OR.  wrk_in_use(3, 1) )THEN
-         CALL ctl_stop('agrif_update_dyn: ERROR: requested workspace arrays unavailable')
-         RETURN
-      END IF
+      CALL wrk_alloc( jpi, jpj,      ztab2d )
+      CALL wrk_alloc( jpi, jpj, jpk, ztab   )
 
       IF (mod(nbcline,nbclineupdate) == 0) THEN
@@ -100 +88 @@
       Agrif_UseSpecialValueInUpdate = .FALSE.
 
-      IF( wrk_not_released(2, 1) .OR. wrk_not_released(3, 1) )THEN
-         CALL ctl_stop('agrif_update_dyn: ERROR: failed to release workspace arrays')
-      END IF
+      CALL wrk_dealloc( jpi, jpj,      ztab2d )
+      CALL wrk_dealloc( jpi, jpj, jpk, ztab   )
 
 !Done in step