Changeset 389 for trunk/NEMO/OPA_SRC/step.F90

Timestamp:

2006-03-09T18:22:04+01:00 (18 years ago)

Author:

opalod

Message:

RB:nemo_v1_update_038: first integration of Agrif :

• configuration parameters are just integer when agrif is used
• add call to agrif routines with key_agrif

File:

• trunk/NEMO/OPA_SRC/step.F90 (modified) (9 diffs)

trunk/NEMO/OPA_SRC/step.F90

@@ -118 +118 @@
    USE prtctl          ! Print control                    (prt_ctl routine)
 
+#if defined key_AGRIF
+   USE agrif_opa_sponge ! Momemtum and tracers sponges
+#endif
+
    IMPLICIT NONE
    PRIVATE
@@ -135 +139 @@
 CONTAINS
 
-   SUBROUTINE stp( kstp )
-      !!----------------------------------------------------------------------
+   SUBROUTINE stp( &
+#if !defined key_AGRIF
+   kstp &
+#endif   
+   )      !!----------------------------------------------------------------------
       !!                     ***  ROUTINE stp  ***
       !!                      
@@ -165 +172 @@
       !!    "   !  04-08  (C. Talandier) New trends organization
       !!    "   !  05-01  (C. Ethe) Add the KPP closure scheme
-      !!    "   !  05-11  (V. Garnier) Surface pressure gradient organization
       !!----------------------------------------------------------------------
       !! * Arguments
-      INTEGER, INTENT( in ) ::   kstp   ! ocean time-step index
+      INTEGER &
+#if !defined key_AGRIF   
+      , INTENT( in ) &
+#endif      
+      ::   kstp   ! ocean time-step index
 
       !! * local declarations
@@ -174 +184 @@
       !! ---------------------------------------------------------------------
 
+#if defined key_AGRIF
+      kstp = nit000 + Agrif_Nb_Step()
+      IF ( Agrif_Root() .and. lwp) Write(*,*) '---'
+      IF (lwp) Write(*,*) 'Grid N°',Agrif_Fixed(),' time step ',kstp
+#endif   
       indic = 1                    ! reset to no error condition
       adatrj = adatrj + rdt/86400._wp
@@ -321 +336 @@
       IF( l_traldf_iso_zps )   CALL tra_ldf_iso_zps( kstp )           ! partial step iso-neutral/geopot. laplacian
 
+#if defined key_AGRIF
+      IF (.NOT. Agrif_Root())  CALL Agrif_Sponge_tra( kstp )          ! tracers sponge
+#endif
       !                                                       ! vertical diffusion
       IF( l_trazdf_exp     )   CALL tra_zdf_exp     ( kstp )          ! explicit time stepping (time splitting scheme)
@@ -353 +371 @@
                                va(:,:,:) = 0.e0
 
-                               CALL dyn_keg( kstp )           ! horizontal gradient of kinetic energy
+      CALL dyn_keg( kstp )           ! horizontal gradient of kinetic energy
 
       !                                                       ! vorticity term including Coriolis
@@ -361 +379 @@
       IF( ln_dynvor_mix    )   CALL dyn_vor_mixed    ( kstp )        ! mixed energy/enstrophy conserving scheme
       IF( ln_dynvor_een    )   CALL dyn_vor_ene_ens  ( kstp )        ! combined energy/enstrophy conserving scheme
-
+      
       !                                                       ! lateral mixing 
       IF( l_dynldf_lap     )   CALL dyn_ldf_lap    ( kstp )          ! iso-level laplacian
@@ -368 +386 @@
       IF( l_dynldf_iso     )   CALL dyn_ldf_iso    ( kstp )          ! iso-neutral laplacian 
 
+#if defined key_AGRIF
+      IF (.NOT. Agrif_Root())  CALL Agrif_Sponge_dyn( kstp )         ! momemtum sponge
+#endif
       !                                                       ! horizontal gradient of Hydrostatic pressure 
       IF ( lk_jki ) THEN
@@ -375 +396 @@
       ENDIF
 
-                               CALL dyn_zad    ( kstp )       ! vertical advection       
+      CALL dyn_zad    ( kstp )       ! vertical advection       
 
       !                                                       ! vertical diffusion