Changeset 4793 for branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/NST_SRC

Timestamp:

2014-09-26T14:38:42+02:00 (10 years ago)

Author:

rblod

Message:

dev_r4765_CNRS_agrif: changes for compatibily with TOP

Location:

branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/NST_SRC

Files:

• agrif_top_interp.F90 (modified) (4 diffs)
• agrif_top_sponge.F90 (modified) (3 diffs)
• agrif_top_update.F90 (modified) (1 diff)
• agrif_user.F90 (modified) (6 diffs)

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

@@ -7 +7 @@
    USE agrif_oce
    USE agrif_top_sponge
+   USE par_trc
    USE trc
    USE lib_mpp
@@ -14 +15 @@
    PRIVATE
 
-   PUBLIC Agrif_trc
+   PUBLIC Agrif_trc, interptrn
 
 #  include "domzgr_substitute.h90"  
@@ -41 +42 @@
    END SUBROUTINE Agrif_trc
 
-   SUBROUTINE interptsn(ptab,i1,i2,j1,j2,k1,k2,n1,n2,before,nb,ndir)
+   SUBROUTINE interptrn(ptab,i1,i2,j1,j2,k1,k2,n1,n2,before,nb,ndir)
       !!---------------------------------------------
-      !!   *** ROUTINE interptsn ***
+      !!   *** ROUTINE interptrn ***
       !!---------------------------------------------
       REAL(wp), DIMENSION(i1:i2,j1:j2,k1:k2,n1:n2), INTENT(inout) :: ptab
@@ -57 +58 @@
 
       IF (before) THEN         
-         ptab(i1:i2,j1:j2,k1:k2,n1:n2) = tsn(i1:i2,j1:j2,k1:k2,n1:n2)
+         ptab(i1:i2,j1:j2,k1:k2,n1:n2) = trn(i1:i2,j1:j2,k1:k2,n1:n2)
       ELSE
          !

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

@@ -4 +4 @@
 #if defined key_agrif && defined key_top
    USE par_oce
+   USE par_trc
    USE oce
    USE dom_oce
@@ -16 +17 @@
    PRIVATE
 
-   PUBLIC Agrif_Sponge_trc, interptrn
+   PUBLIC Agrif_Sponge_trc, interptrn_sponge
 
    !! * Substitutions
@@ -40 +41 @@
       Agrif_SpecialValue=0.
       Agrif_UseSpecialValue = .TRUE.
-      tabspongetrn = .FALSE.
+      tabspongedone_trn = .FALSE.
       CALL Agrif_Bc_Variable(trn_sponge_id,calledweight=timecoeff,procname=interptrn_sponge)
       Agrif_UseSpecialValue = .FALSE.

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

@@ -8 +8 @@
    USE dom_oce
    USE agrif_oce
+   USE par_trc
    USE trc
    USE wrk_nemo  

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

@@ -150 +150 @@
    CALL Agrif_Set_Updatetype(e2v_id,update1 = Agrif_Update_Average, update2=Agrif_Update_Copy)
 
+! High order updates
+!   CALL Agrif_Set_Updatetype(e1u_id,update1 = Agrif_Update_Average,            update2=Agrif_Update_Full_Weighting)
+!   CALL Agrif_Set_Updatetype(e2v_id,update1 = Agrif_Update_Full_Weighting,     update2=Agrif_Update_Average)
+    !
 END SUBROUTINE agrif_declare_var_dom
 
@@ -404 +408 @@
    CALL Agrif_Set_Updatetype(avmv_id, update = AGRIF_Update_Average)
 # endif
+
+! High order updates
+!   CALL Agrif_Set_Updatetype(tsn_id, update = Agrif_Update_Full_Weighting)
+!   CALL Agrif_Set_Updatetype(un_update_id,update1 = Agrif_Update_Average, update2 =                           Agrif_Update_Full_Weighting)
+!   CALL Agrif_Set_Updatetype(vn_update_id,update1 = Agrif_Update_Full_Weighting, update2 =                    Agrif_Update_Average)
+!
+!   CALL Agrif_Set_Updatetype(ub2b_update_id,update1 = Agrif_Update_Average, update2 =                           Agrif_Update_Full_Weighting)
+!   CALL Agrif_Set_Updatetype(vb2b_update_id,update1 = Agrif_Update_Full_Weighting, update2 =                    Agrif_Update_Average)
+!   CALL Agrif_Set_Updatetype(sshn_id, update = Agrif_Update_Full_Weighting)
+ 
    !
 END SUBROUTINE agrif_declare_var
@@ -499 +513 @@
    CALL Agrif_Set_Updatetype(u_ice_id,update1 = Agrif_Update_Copy, update2 = Agrif_Update_Average)
    CALL Agrif_Set_Updatetype(v_ice_id,update1 = Agrif_Update_Average, update2 = Agrif_Update_Copy)
-
+   ! 
 END SUBROUTINE agrif_declare_var_lim2
 #  endif
@@ -519 +533 @@
    USE trc
    USE in_out_manager
+   USE agrif_opa_sponge
    USE agrif_top_update
    USE agrif_top_interp
@@ -641 +656 @@
    !--------------- 
    CALL Agrif_Set_Updatetype(trn_id, update = AGRIF_Update_Average)
+
+!   Higher order update
+!   CALL Agrif_Set_Updatetype(tsn_id, update = Agrif_Update_Full_Weighting)
+
    !
 END SUBROUTINE agrif_declare_var_top
@@ -649 +668 @@
    !!   *** ROUTINE Agrif_detect ***
    !!----------------------------------------------------------------------
-   USE Agrif_Types
    !
    INTEGER, DIMENSION(2) :: ksizex