Changeset 5081 for branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90

Timestamp:

2015-02-13T10:51:27+01:00 (9 years ago)

Author:

smasson

Message:

dev_r4765_CNRS_agrif: final version of tke/agrif?

File:

• branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90 (modified) (4 diffs)

branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90

@@ -43 +43 @@
    PUBLIC   interpe3t, interpumsk, interpvmsk
 # if defined key_zdftke
-   PUBLIC   Agrif_tke, interpavt, interpavm, interpavmu, interpavmv
+   PUBLIC   Agrif_tke, interpavm
 # endif
 
@@ -609 +609 @@
       !!                  ***  ROUTINE Agrif_tke  ***
       !!----------------------------------------------------------------------  
-      !
-      IF( Agrif_Root() )   RETURN
-
+      REAL(wp) ::   zalpha
+      !
+      zalpha = REAL( Agrif_NbStepint() + Agrif_IRhot() - 1, wp ) / REAL( Agrif_IRhot(), wp )
+      IF( zalpha > 1. )   zalpha = 1.
       
       Agrif_SpecialValue    = 0.e0
       Agrif_UseSpecialValue = .TRUE.
       
-      CALL Agrif_Bc_variable(avt_id , procname=interpavt)       
-      CALL Agrif_Bc_variable(avm_id , procname=interpavm)       
-      CALL Agrif_Bc_variable(avmu_id, procname=interpavmu)
-      CALL Agrif_Bc_variable(avmv_id, procname=interpavmv)
+      CALL Agrif_Bc_variable(avm_id ,calledweight=zalpha, procname=interpavm)       
               
       Agrif_UseSpecialValue = .FALSE.
@@ -1321 +1319 @@
 
 # if defined key_zdftke
-   SUBROUTINE interpavt(ptab,i1,i2,j1,j2,k1,k2,before)
-      !!----------------------------------------------------------------------
-      !!                  ***  ROUTINE interavt  ***
-      !!----------------------------------------------------------------------  
-      INTEGER, INTENT(in) :: i1,i2,j1,j2,k1,k2
-      REAL(wp),DIMENSION(i1:i2,j1:j2,k1:k2), INTENT(inout) :: ptab      
-      LOGICAL, INTENT(in) :: before
-      !!----------------------------------------------------------------------  
-      !      
-      IF( before) THEN
-         ptab (i1:i2,j1:j2,k1:k2) = avt_k(i1:i2,j1:j2,k1:k2)
-      ELSE
-         avt_k(i1:i2,j1:j2,k1:k2) = ptab (i1:i2,j1:j2,k1:k2)
-      ENDIF
-      !
-      
-   END SUBROUTINE interpavt
-
 
    SUBROUTINE interpavm(ptab,i1,i2,j1,j2,k1,k2,before)
@@ -1357 +1337 @@
    END SUBROUTINE interpavm
 
-
-   SUBROUTINE interpavmu(ptab,i1,i2,j1,j2,k1,k2,before)
-      !!----------------------------------------------------------------------
-      !!                  ***  ROUTINE interavmu  ***
-      !!----------------------------------------------------------------------  
-      INTEGER, INTENT(in) :: i1,i2,j1,j2,k1,k2
-      REAL(wp),DIMENSION(i1:i2,j1:j2,k1:k2), INTENT(inout) :: ptab
-      LOGICAL, INTENT(in) :: before
-      !!----------------------------------------------------------------------  
-      !
-      IF( before) THEN
-         ptab  (i1:i2,j1:j2,k1:k2) = avmu_k(i1:i2,j1:j2,k1:k2)
-      ELSE
-         avmu_k(i1:i2,j1:j2,k1:k2) = ptab   (i1:i2,j1:j2,k1:k2)
-      ENDIF
-      !      
-   END SUBROUTINE interpavmu
-
-
-   SUBROUTINE interpavmv(ptab,i1,i2,j1,j2,k1,k2,before)
-      !!----------------------------------------------------------------------
-      !!                  ***  ROUTINE interavmv  ***
-      !!----------------------------------------------------------------------  
-      INTEGER, INTENT(in) :: i1,i2,j1,j2,k1,k2
-      REAL(wp),DIMENSION(i1:i2,j1:j2,k1:k2), INTENT(inout) :: ptab
-      LOGICAL, INTENT(in) :: before
-      !!----------------------------------------------------------------------  
-      !
-      IF( before) THEN
-         ptab  (i1:i2,j1:j2,k1:k2) = avmv_k(i1:i2,j1:j2,k1:k2)
-      ELSE
-         avmv_k(i1:i2,j1:j2,k1:k2) = ptab  (i1:i2,j1:j2,k1:k2)
-      ENDIF
-      !
-   END SUBROUTINE interpavmv
 # endif /* key_zdftke */