Changeset 2715 for trunk/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90

Timestamp:

2011-03-30T17:58:35+02:00 (13 years ago)

Author:

rblod

Message:

First attempt to put dynamic allocation on the trunk

File:

• trunk/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90 (modified) (5 diffs)

trunk/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90

@@ -7 +7 @@
    USE dom_oce
    USE agrif_oce
+   USE in_out_manager  ! I/O manager
+   USE lib_mpp
 
    IMPLICIT NONE
@@ -27 +29 @@
       !!   *** ROUTINE Agrif_Update_Tra ***
       !!---------------------------------------------
+      USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
+      USE wrk_nemo, ONLY: wrk_3d_1
+      !!
       INTEGER, INTENT(in) :: kt
-
-      REAL :: ztab(jpi,jpj,jpk)
-
+      REAL(wp), POINTER, DIMENSION(:,:,:) :: ztab
+
+       
       IF((Agrif_NbStepint() .NE. (Agrif_irhot()-1)).AND.(kt /= 0)) RETURN
 #if defined TWO_WAY
+      ztab => wrk_3d_1
+      IF( wrk_in_use(3, 1) ) THEN
+         CALL ctl_stop('agrif_update_tra: ERROR: requested workspace arrays unavailable')
+         RETURN
+      END IF
+
       Agrif_UseSpecialValueInUpdate = .TRUE.
       Agrif_SpecialValueFineGrid = 0.
 
       IF (MOD(nbcline,nbclineupdate) == 0) THEN
-         CALL Agrif_Update_Variable(ztab,tn, procname=updateT)
-         CALL Agrif_Update_Variable(ztab,sn, procname=updateS)
-      ELSE
-         CALL Agrif_Update_Variable(ztab,tn,locupdate=(/0,2/), procname=updateT)
-         CALL Agrif_Update_Variable(ztab,sn,locupdate=(/0,2/), procname=updateS)
+         CALL Agrif_Update_Variable(ztab,tn_id, procname=updateT)
+         CALL Agrif_Update_Variable(ztab,sn_id, procname=updateS)
+      ELSE
+         CALL Agrif_Update_Variable(ztab,tn_id,locupdate=(/0,2/), procname=updateT)
+         CALL Agrif_Update_Variable(ztab,sn_id,locupdate=(/0,2/), procname=updateS)
       ENDIF
 
       Agrif_UseSpecialValueInUpdate = .FALSE.
+
+      IF( wrk_not_released(3, 1) ) THEN
+         CALL ctl_stop('Agrif_Update_Tra: ERROR: failed to release workspace arrays')
+      END IF
 #endif
 
@@ -53 +68 @@
       !!   *** 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
-
-      REAL(wp), DIMENSION(jpi,jpj) :: ztab2d
-      REAL(wp), DIMENSION(jpi,jpj,jpk) :: ztab
+      REAL(wp), POINTER, DIMENSION(:,:) :: ztab2d
+      REAL(wp), POINTER, DIMENSION(:,:,:) :: ztab
+
 
       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
 
       IF (mod(nbcline,nbclineupdate) == 0) THEN
-         CALL Agrif_Update_Variable(ztab,un,procname = updateU)
-         CALL Agrif_Update_Variable(ztab,vn,procname = updateV)
-      ELSE
-         CALL Agrif_Update_Variable(ztab,un,locupdate=(/0,1/),procname = updateU)
-         CALL Agrif_Update_Variable(ztab,vn,locupdate=(/0,1/),procname = updateV)         
-      ENDIF
-
-      CALL Agrif_Update_Variable(ztab2d,e1u,procname = updateU2d)
-      CALL Agrif_Update_Variable(ztab2d,e2v,procname = updateV2d)  
+         CALL Agrif_Update_Variable(ztab,un_id,procname = updateU)
+         CALL Agrif_Update_Variable(ztab,vn_id,procname = updateV)
+      ELSE
+         CALL Agrif_Update_Variable(ztab,un_id,locupdate=(/0,1/),procname = updateU)
+         CALL Agrif_Update_Variable(ztab,vn_id,locupdate=(/0,1/),procname = updateV)         
+      ENDIF
+
+      CALL Agrif_Update_Variable(ztab2d,e1u_id,procname = updateU2d)
+      CALL Agrif_Update_Variable(ztab2d,e2v_id,procname = updateV2d)  
 
       nbcline = nbcline + 1
@@ -76 +100 @@
       Agrif_UseSpecialValueInUpdate = ln_spc_dyn
       Agrif_SpecialValueFineGrid = 0.
-      CALL Agrif_Update_Variable(ztab2d,sshn,procname = updateSSH)
+      CALL Agrif_Update_Variable(ztab2d,sshn_id,procname = updateSSH)
       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
 
 !Done in step
@@ -184 +211 @@
                DO ji=i1,i2
                   tabres(ji,jj,jk) = e2u(ji,jj) * un(ji,jj,jk)
+                  tabres(ji,jj,jk) = tabres(ji,jj,jk) * fse3u(ji,jj,jk)
                END DO
             END DO