Changeset 5081 for branches/2014/dev_r4765_CNRS_agrif/NEMOGCM/NEMO/NST_SRC/agrif_user.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_user.F90 (modified) (7 diffs)

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

@@ -316 +316 @@
    !
 # if defined key_zdftke
-   IF( ln_agrif_tke ) THEN
    CALL Agrif_Update_tke(0)
-   ENDIF    
 # endif
    !
@@ -369 +367 @@
 
 # if defined key_zdftke
+   CALL agrif_declare_variable((/2,2,0/),(/3,3,0/),(/'x','y','N'/),(/1,1,1/),(/jpi,jpj,jpk/), en_id)
    CALL agrif_declare_variable((/2,2,0/),(/3,3,0/),(/'x','y','N'/),(/1,1,1/),(/jpi,jpj,jpk/),avt_id)
    CALL agrif_declare_variable((/2,2,0/),(/3,3,0/),(/'x','y','N'/),(/1,1,1/),(/jpi,jpj,jpk/),avm_id)
-   CALL agrif_declare_variable((/1,2,0/),(/2,3,0/),(/'x','y','N'/),(/1,1,1/),(/jpi,jpj,jpk/),avmu_id)
-   CALL agrif_declare_variable((/2,1,0/),(/3,2,0/),(/'x','y','N'/),(/1,1,1/),(/jpi,jpj,jpk/),avmv_id)
 # endif
 
@@ -399 +396 @@
 
 # if defined key_zdftke
-   CALL Agrif_Set_bcinterp(avt_id ,interp=AGRIF_linear)
    CALL Agrif_Set_bcinterp(avm_id ,interp=AGRIF_linear)
-   CALL Agrif_Set_bcinterp(avmu_id,interp=AGRIF_linear)
-   CALL Agrif_Set_bcinterp(avmv_id,interp=AGRIF_linear)
 # endif
 
@@ -430 +424 @@
 
 # if defined key_zdftke
-   CALL Agrif_Set_bc(avt_id ,(/0,1/))
    CALL Agrif_Set_bc(avm_id ,(/0,1/))
-   CALL Agrif_Set_bc(avmu_id,(/0,1/))
-   CALL Agrif_Set_bc(avmv_id,(/0,1/))
 # endif
 
@@ -451 +442 @@
 
 # if defined key_zdftke
+   CALL Agrif_Set_Updatetype( en_id, update = AGRIF_Update_Average)
    CALL Agrif_Set_Updatetype(avt_id, update = AGRIF_Update_Average)
    CALL Agrif_Set_Updatetype(avm_id, update = AGRIF_Update_Average)
-   CALL Agrif_Set_Updatetype(avmu_id, update = AGRIF_Update_Average)
-   CALL Agrif_Set_Updatetype(avmv_id, update = AGRIF_Update_Average)
 # endif
 
@@ -740 +730 @@
    INTEGER  ::   ios                 ! Local integer output status for namelist read
    INTEGER  ::   iminspon
-   NAMELIST/namagrif/ nn_cln_update, rn_sponge_tra, rn_sponge_dyn, ln_spc_dyn, ln_chk_bathy,   &
-                 &    ln_agrif_tke
+   NAMELIST/namagrif/ nn_cln_update, rn_sponge_tra, rn_sponge_dyn, ln_spc_dyn, ln_chk_bathy
    !!--------------------------------------------------------------------------------------
    !
@@ -763 +752 @@
       WRITE(numout,*) '      use special values for dynamics   ln_spc_dyn    = ', ln_spc_dyn
       WRITE(numout,*) '      check bathymetry                  ln_chk_bathy  = ', ln_chk_bathy
-      WRITE(numout,*) '      use TKE interpolation/update      ln_agrif_tke  = ', ln_agrif_tke
       WRITE(numout,*) 
    ENDIF