Changeset 8866 for branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/NST_SRC

Timestamp:

2017-12-01T07:22:09+01:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-09): Agrif: remove Agrif_update_tke + style cleaning

Location:

branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/NST_SRC

Files:

• agrif_opa_interp.F90 (modified) (5 diffs)
• agrif_opa_update.F90 (modified) (5 diffs)

branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/NST_SRC/agrif_opa_interp.F90

@@ -4 +4 @@
    !! AGRIF: interpolation package for the ocean dynamics (OPA)
    !!======================================================================
-   !! History :  2.0  !  2002-06  (XXX)  Original cade
-   !!             -   !  2005-11  (XXX) 
+   !! History :  2.0  !  2002-06  (L. Debreu)  Original cade
    !!            3.2  !  2009-04  (R. Benshila) 
    !!            3.6  !  2014-09  (R. Benshila) 
@@ -15 +14 @@
    !!   Agrif_tra     :
    !!   Agrif_dyn     : 
+   !!   Agrif_ssh     :
+   !!   Agrif_dyn_ts  :
+   !!   Agrif_dta_ts  :
+   !!   Agrif_ssh_ts  :
+   !!   Agrif_avm     : 
    !!   interpu       :
    !!   interpv       :
@@ -37 +41 @@
    PUBLIC   interpunb, interpvnb , interpub2b, interpvb2b
    PUBLIC   interpe3t, interpumsk, interpvmsk
-   PUBLIC   Agrif_tke, interpavm
+   PUBLIC   Agrif_avm, interpavm
 
    INTEGER ::   bdy_tinterp = 0
@@ -595 +599 @@
 
 
-   SUBROUTINE Agrif_tke
-      !!----------------------------------------------------------------------
-      !!                  ***  ROUTINE Agrif_tke  ***
+   SUBROUTINE Agrif_avm
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE Agrif_avm  ***
       !!----------------------------------------------------------------------  
       REAL(wp) ::   zalpha
       !!----------------------------------------------------------------------  
       !
-      zalpha = 1._wp ! JC: proper time interpolation impossible 
-                     ! => use last available value from parent 
-      !
-      Agrif_SpecialValue    = 0.e0
+      zalpha = 1._wp   ! proper time interpolation impossible  ==> use last available value from parent 
+      !
+      Agrif_SpecialValue    = 0._wp
       Agrif_UseSpecialValue = .TRUE.
       !
-      CALL Agrif_Bc_variable(avm_id ,calledweight=zalpha, procname=interpavm)       
+      CALL Agrif_Bc_variable( avm_id, calledweight=zalpha, procname=interpavm )       
       !
       Agrif_UseSpecialValue = .FALSE.
       !
-   END SUBROUTINE Agrif_tke
+   END SUBROUTINE Agrif_avm
    
 
@@ -630 +633 @@
       !!----------------------------------------------------------------------
       !
-      IF (before) THEN         
+      IF( before ) THEN         
          ptab(i1:i2,j1:j2,k1:k2,n1:n2) = tsn(i1:i2,j1:j2,k1:k2,n1:n2)
       ELSE
          !
-         western_side  = (nb == 1).AND.(ndir == 1)  ;  eastern_side  = (nb == 1).AND.(ndir == 2)
-         southern_side = (nb == 2).AND.(ndir == 1)  ;  northern_side = (nb == 2).AND.(ndir == 2)
+         western_side  = (nb == 1).AND.(ndir == 1)   ;   eastern_side  = (nb == 1).AND.(ndir == 2)
+         southern_side = (nb == 2).AND.(ndir == 1)   ;   northern_side = (nb == 2).AND.(ndir == 2)
          !
          IF( nbghostcells > 1 ) THEN  ! no smoothing

branches/2017/dev_r7881_ENHANCE09_RK3/NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90

@@ -7 +7 @@
    !! AGRIF: update package for the ocean dynamics (OPA)
    !!======================================================================
-   !! History :  2.0  !  2002-06  (XXX)  Original cade
-   !!             -   !  2005-11  (XXX) 
+   !! History :  2.0  !  2002-06  (L. Debreu)  Original code
    !!            3.2  !  2009-04  (R. Benshila) 
    !!            3.6  !  2014-09  (R. Benshila) 
@@ -29 +28 @@
 
    PUBLIC   Agrif_Update_Tra, Agrif_Update_Dyn, Update_Scales
-   PUBLIC   Agrif_Update_Tke
 
    !!----------------------------------------------------------------------
@@ -160 +158 @@
    END SUBROUTINE Agrif_Update_Dyn
 
-!!gm Missing GLS case !!!!!
-
-   SUBROUTINE Agrif_Update_Tke( kt )
-      !!----------------------------------------------------------------------
-      !!                   *** ROUTINE Agrif_Update_Tke ***
-      !!----------------------------------------------------------------------
-      INTEGER, INTENT(in) ::   kt   ! timestep index
-      !!----------------------------------------------------------------------
-      !
-!!gm test on kt/=0  ????  why not nit000-1  ?  doesn't seem logic
-      IF( ( Agrif_NbStepint() /= 0 ) .AND. kt /= 0 )   RETURN
-#  if defined TWO_WAY
-      !
-      Agrif_UseSpecialValueInUpdate = .TRUE.
-      Agrif_SpecialValueFineGrid    = 0._wp
-      !
-      CALL Agrif_Update_Variable(  en_id, locupdate=(/0,0/), procname=updateEN  )
-      CALL Agrif_Update_Variable( avt_id, locupdate=(/0,0/), procname=updateAVT )
-      CALL Agrif_Update_Variable( avm_id, locupdate=(/0,0/), procname=updateAVM )
-      !
-      Agrif_UseSpecialValueInUpdate = .FALSE.
-      !
-#  endif
-      !
-   END SUBROUTINE Agrif_Update_Tke
-   
 
    SUBROUTINE updateTS( tabres, i1, i2, j1, j2, k1, k2, n1, n2, before )
@@ -215 +187 @@
                   DO jj = j1, j2
                      DO ji = i1, i2
-                        IF( tabres(ji,jj,jk,jn) .NE. 0. ) THEN
+                        IF( tabres(ji,jj,jk,jn) /= 0._wp ) THEN
                            tsb(ji,jj,jk,jn) = tsb(ji,jj,jk,jn) & 
                               &             + atfp * ( tabres(ji,jj,jk,jn) - tsn(ji,jj,jk,jn) ) * tmask(ji,jj,jk)
@@ -228 +200 @@
                DO jj=j1,j2
                   DO ji=i1,i2
-                     IF( tabres(ji,jj,jk,jn) .NE. 0. ) THEN 
+                     IF( tabres(ji,jj,jk,jn) /= 0._wp ) THEN 
                         tsn(ji,jj,jk,jn) = tabres(ji,jj,jk,jn) * tmask(ji,jj,jk)
                      END IF