Changeset 1271 for trunk/NEMO/NST_SRC

Timestamp:

2009-01-15T09:12:00+01:00 (15 years ago)

Author:

rblod

Message:

Addapt AGRIF routines to the new TOP organization, clean some routines and add a sponge layer for passive tracers, see ticket #293

Location:

trunk/NEMO/NST_SRC

Files:

• agrif_top_interp.F90 (modified) (3 diffs)
• agrif_top_sponge.F90 (added)
• agrif_top_update.F90 (modified) (1 diff)
• agrif_user.F90 (modified) (5 diffs)

trunk/NEMO/NST_SRC/agrif_top_interp.F90

@@ -6 +6 @@
    USE sol_oce
    USE agrif_oce
-   USE trcstp
-   USE sms
+   USE trc
 
    IMPLICIT NONE
@@ -22 +21 @@
    CONTAINS
 
-   SUBROUTINE Agrif_trc( kt )
+   SUBROUTINE Agrif_trc
       !!---------------------------------------------
       !!   *** ROUTINE Agrif_trc ***
@@ -29 +28 @@
 #  include "vectopt_loop_substitute.h90"
       
-      INTEGER, INTENT(in) :: kt
-
       INTEGER :: ji,jj,jk,jn
       REAL(wp) :: zrhox

trunk/NEMO/NST_SRC/agrif_top_update.F90

@@ -8 +8 @@
    USE dom_oce
    USE agrif_oce
-   USE trcstp
-   USE sms
+   USE trc
 
    IMPLICIT NONE

trunk/NEMO/NST_SRC/agrif_user.F90

@@ -62 +62 @@
       USE dom_oce
       USE opa
-      USE sms
+#if defined key_top
+      USE trc
+#endif
 #if defined key_tradmp   ||   defined key_esopa
       USE tradmp
@@ -76 +78 @@
       USE agrif_top_update
       USE agrif_top_interp
+      USE agrif_top_sponge
 
       IMPLICIT NONE
@@ -153 +156 @@
 
 #if defined key_top
+      Call Agrif_Set_raf(trn,(/'x','y','N','N'/))
       Call Agrif_Set_raf(trb,(/'x','y','N','N'/))
-      Call Agrif_Set_raf(trn,(/'x','y','N','N'/))
       Call Agrif_Set_raf(tra,(/'x','y','N','N'/))
 #endif
@@ -241 +244 @@
 #if defined key_top
       Call Agrif_Bc_variable(tabtrtemp,trn,calledweight=1.)
-      Call Agrif_Bc_variable(tabtrtemp,tra,calledweight=1.)
+      Call Agrif_Bc_variable(tabtrtemp,tra,calledweight=1.,procname=interptrn)
 #endif
       Agrif_UseSpecialValue = .FALSE.
@@ -292 +295 @@
             ENDIF
          ENDIF
+#if defined key_top
+        ! Check passive tracer cell
+        IF( ndttrc .ne. 1 ) THEN
+           WRITE(*,*) 'ndttrc should be equal to 1'
+        ENDIF
+#endif
 
       ENDIF
 
+#if defined key_top
+      CALL Agrif_Update_trc(0)
+#endif
       CALL Agrif_Update_tra(0)
       CALL Agrif_Update_dyn(0)