Changeset 3917

Timestamp:

2013-06-12T23:04:27+02:00 (11 years ago)

Author:

smasson

Message:

v3_4_STABLE: (kind of) bugfix in agrif, see tricket #1111

Location:

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/NST_SRC

Files:

• agrif_opa_sponge.F90 (modified) (6 diffs)
• agrif_opa_update.F90 (modified) (5 diffs)
• agrif_top_sponge.F90 (modified) (3 diffs)

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/NST_SRC/agrif_opa_sponge.F90

@@ -35 +35 @@
       REAL(wp), POINTER, DIMENSION(:,:    ) :: localviscsponge
       REAL(wp), POINTER, DIMENSION(:,:    ) :: ztu, ztv
-      REAL(wp), POINTER, DIMENSION(:,:,:,:) :: ztab
+      REAL(wp), POINTER, DIMENSION(:,:,:,:) :: ztab4d
       REAL(wp), POINTER, DIMENSION(:,:,:,:) :: tsbdiff
 
 #if defined SPONGE
       CALL wrk_alloc( jpi, jpj, localviscsponge, ztu, ztv )
-      CALL wrk_alloc( jpi, jpj, jpk, jpts, ztab, tsbdiff  )
+      CALL wrk_alloc( jpi, jpj, jpk, jpts, ztab4d, tsbdiff  )
 
       timecoeff = REAL(Agrif_NbStepint(),wp)/Agrif_rhot()
@@ -46 +46 @@
       Agrif_SpecialValue=0.
       Agrif_UseSpecialValue = .TRUE.
-      ztab = 0.e0
-      CALL Agrif_Bc_Variable(ztab, tsa_id,calledweight=timecoeff,procname=interptsn)
+      ztab4d = 0.e0
+      CALL Agrif_Bc_Variable(ztab4d, tsa_id,calledweight=timecoeff,procname=interptsn)
       Agrif_UseSpecialValue = .FALSE.
 
-      tsbdiff(:,:,:,:) = tsb(:,:,:,:) - ztab(:,:,:,:)
+      tsbdiff(:,:,:,:) = tsb(:,:,:,:) - ztab4d(:,:,:,:)
 
       spongearea = 2 + 2 * Agrif_irhox()
@@ -148 +148 @@
 
       CALL wrk_dealloc( jpi, jpj, localviscsponge, ztu, ztv )
-      CALL wrk_dealloc( jpi, jpj, jpk, jpts, ztab, tsbdiff  )
+      CALL wrk_dealloc( jpi, jpj, jpk, jpts, ztab4d, tsbdiff  )
 #endif
 
@@ -166 +166 @@
       REAL(wp), POINTER, DIMENSION(:,:,:) :: ubdiff, vbdiff
       REAL(wp), POINTER, DIMENSION(:,:,:) :: rotdiff, hdivdiff
-      REAL(wp), POINTER, DIMENSION(:,:,:) :: ztab
+      REAL(wp), POINTER, DIMENSION(:,:,:) :: ztab3d
 
 #if defined SPONGE
       CALL wrk_alloc( jpi, jpj, localviscsponge )
-      CALL wrk_alloc( jpi, jpj, jpk, ztab, ubdiff, vbdiff, rotdiff, hdivdiff )
+      CALL wrk_alloc( jpi, jpj, jpk, ztab3d, ubdiff, vbdiff, rotdiff, hdivdiff )
 
       timecoeff = REAL(Agrif_NbStepint(),wp)/Agrif_rhot()
@@ -176 +176 @@
       Agrif_SpecialValue=0.
       Agrif_UseSpecialValue = ln_spc_dyn
-      ztab = 0.e0
-      CALL Agrif_Bc_Variable(ztab, ua_id,calledweight=timecoeff,procname=interpun)
+      ztab3d = 0.e0
+      CALL Agrif_Bc_Variable(ztab3d, ua_id,calledweight=timecoeff,procname=interpun)
       Agrif_UseSpecialValue = .FALSE.
 
-      ubdiff(:,:,:) = (ub(:,:,:) - ztab(:,:,:))*umask(:,:,:)
-
-      ztab = 0.e0
+      ubdiff(:,:,:) = (ub(:,:,:) - ztab3d(:,:,:))*umask(:,:,:)
+
+      ztab3d = 0.e0
       Agrif_SpecialValue=0.
       Agrif_UseSpecialValue = ln_spc_dyn
-      CALL Agrif_Bc_Variable(ztab, va_id,calledweight=timecoeff,procname=interpvn)
+      CALL Agrif_Bc_Variable(ztab3d, va_id,calledweight=timecoeff,procname=interpvn)
       Agrif_UseSpecialValue = .FALSE.
 
-      vbdiff(:,:,:) = (vb(:,:,:) - ztab(:,:,:))*vmask(:,:,:)
+      vbdiff(:,:,:) = (vb(:,:,:) - ztab3d(:,:,:))*vmask(:,:,:)
 
       spongearea = 2 + 2 * Agrif_irhox()
@@ -318 +318 @@
       !                                                ! ===============
       CALL wrk_dealloc( jpi, jpj, localviscsponge )
-      CALL wrk_dealloc( jpi, jpj, jpk, ztab, ubdiff, vbdiff, rotdiff, hdivdiff )
+      CALL wrk_dealloc( jpi, jpj, jpk, ztab3d, ubdiff, vbdiff, rotdiff, hdivdiff )
 
 #endif

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90

@@ -32 +32 @@
       !!
       INTEGER, INTENT(in) :: kt
-      REAL(wp), POINTER, DIMENSION(:,:,:,:) :: ztab
+      REAL(wp), POINTER, DIMENSION(:,:,:,:) :: ztab4d
 
        
       IF((Agrif_NbStepint() .NE. (Agrif_irhot()-1)).AND.(kt /= 0)) RETURN
 #if defined TWO_WAY
-      CALL wrk_alloc( jpi, jpj, jpk, jpts, ztab )
+      CALL wrk_alloc( jpi, jpj, jpk, jpts, ztab4d )
 
       Agrif_UseSpecialValueInUpdate = .TRUE.
@@ -43 +43 @@
 
       IF (MOD(nbcline,nbclineupdate) == 0) THEN
-         CALL Agrif_Update_Variable(ztab,tsn_id, procname=updateTS)
-      ELSE
-         CALL Agrif_Update_Variable(ztab,tsn_id,locupdate=(/0,2/), procname=updateTS)
+         CALL Agrif_Update_Variable(ztab4d,tsn_id, procname=updateTS)
+      ELSE
+         CALL Agrif_Update_Variable(ztab4d,tsn_id,locupdate=(/0,2/), procname=updateTS)
       ENDIF
 
       Agrif_UseSpecialValueInUpdate = .FALSE.
 
-      CALL wrk_dealloc( jpi, jpj, jpk, jpts, ztab )
+      CALL wrk_dealloc( jpi, jpj, jpk, jpts, ztab4d )
 #endif
 
@@ -62 +62 @@
       INTEGER, INTENT(in) :: kt
       REAL(wp), POINTER, DIMENSION(:,:) :: ztab2d
-      REAL(wp), POINTER, DIMENSION(:,:,:) :: ztab
+      REAL(wp), POINTER, DIMENSION(:,:,:) :: ztab3d
 
 
@@ -68 +68 @@
 #if defined TWO_WAY
       CALL wrk_alloc( jpi, jpj,      ztab2d )
-      CALL wrk_alloc( jpi, jpj, jpk, ztab   )
+      CALL wrk_alloc( jpi, jpj, jpk, ztab3d )
 
       IF (mod(nbcline,nbclineupdate) == 0) THEN
-         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)         
+         CALL Agrif_Update_Variable(ztab3d,un_id,procname = updateU)
+         CALL Agrif_Update_Variable(ztab3d,vn_id,procname = updateV)
+      ELSE
+         CALL Agrif_Update_Variable(ztab3d,un_id,locupdate=(/0,1/),procname = updateU)
+         CALL Agrif_Update_Variable(ztab3d,vn_id,locupdate=(/0,1/),procname = updateV)         
       ENDIF
 
@@ -89 +89 @@
 
       CALL wrk_dealloc( jpi, jpj,      ztab2d )
-      CALL wrk_dealloc( jpi, jpj, jpk, ztab   )
+      CALL wrk_dealloc( jpi, jpj, jpk, ztab3d )
 
 !Done in step

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/NST_SRC/agrif_top_sponge.F90

@@ -36 +36 @@
       REAL(wp) :: ztra, zabe1, zabe2, zbtr
       REAL(wp), POINTER, DIMENSION(:,:) :: localviscsponge
-      REAL(wp), POINTER, DIMENSION(:,:,:,:) :: trbdiff, ztru, ztrv, ztab
+      REAL(wp), POINTER, DIMENSION(:,:,:,:) :: trbdiff, ztru, ztrv, ztab4d
 
 #if defined SPONGE_TOP
       CALL wrk_alloc( jpi, jpj, localviscsponge )
-      CALL wrk_alloc( jpi, jpj, jpk, jptra, trbdiff, ztru, ztrv, ztab )
+      CALL wrk_alloc( jpi, jpj, jpk, jptra, trbdiff, ztru, ztrv, ztab4d )
 
       timecoeff = REAL(Agrif_NbStepint(),wp)/Agrif_rhot()
@@ -46 +46 @@
       Agrif_SpecialValue=0.
       Agrif_UseSpecialValue = .TRUE.
-      ztab = 0.e0
-      CALL Agrif_Bc_Variable(ztab, tra_id,calledweight=timecoeff,procname=interptrn)
+      ztab4d = 0.e0
+      CALL Agrif_Bc_Variable(ztab4d, tra_id,calledweight=timecoeff,procname=interptrn)
       Agrif_UseSpecialValue = .FALSE.
 
-      trbdiff(:,:,:,:) = trb(:,:,:,:) - ztab(:,:,:,:)
+      trbdiff(:,:,:,:) = trb(:,:,:,:) - ztab4d(:,:,:,:)
 
       spongearea = 2 + 2 * Agrif_irhox()
@@ -147 +147 @@
  
       CALL wrk_dealloc( jpi, jpj, localviscsponge )
-      CALL wrk_dealloc( jpi, jpj, jpk, jptra, trbdiff, ztru, ztrv, ztab )
+      CALL wrk_dealloc( jpi, jpj, jpk, jptra, trbdiff, ztru, ztrv, ztab4d )
 
 #endif