Changeset 7060 for branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/NST_SRC/agrif_user.F90

Timestamp:

2016-10-20T16:16:29+02:00 (8 years ago)

Author:

clem

Message:

update agrif+lim3

File:

• branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/NST_SRC/agrif_user.F90 (modified) (6 diffs)

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/NST_SRC/agrif_user.F90

@@ -306 +306 @@
    ! Note that update below is recursive (with lk_agrif_doupd=T):
    ! 
+!!#if ! defined key_sas2D
 ! JC: I am not sure if Agrif_MaxLevel() is the "relative"
 !     or the absolute maximum nesting level...TBC                        
@@ -313 +314 @@
       CALL Agrif_Update_dyn()
    ENDIF
+!!#endif   
    !
 # if defined key_zdftke
@@ -321 +323 @@
    nbcline = 0
    lk_agrif_doupd = .FALSE.
+
    !
 END SUBROUTINE Agrif_InitValues_cont
@@ -454 +457 @@
 !   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
@@ -609 +612 @@
    !! ** Purpose :: Declaration of variables to be interpolated for LIM3
    !!----------------------------------------------------------------------
-   USE agrif_util
+   USE Agrif_Util
+   USE Agrif_ice  !clem useless ?
    USE ice
 
@@ -618 +622 @@
    !       agrif_declare_variable(position,1st point index,--,--,dimensions,name)
    !-------------------------------------------------------------------------------------
-   CALL agrif_declare_variable((/2,2,0,0/),(/3,3,0,0/),(/'x','y','N','N'/),(/1,1,1,1/), &
-      &                        (/jpi,jpj,jpl,jpl*(5+nlay_s+nlay_i)/), tra_ice_id )
-   CALL agrif_declare_variable((/1,2/)    ,(/2,3/)    ,(/'x','y'/)        ,(/1,1/)    ,(/jpi,jpj/)      ,u_ice_id  )
-   CALL agrif_declare_variable((/2,1/)    ,(/3,2/)    ,(/'x','y'/)        ,(/1,1/)    ,(/jpi,jpj/)      ,v_ice_id  )
+   CALL agrif_declare_variable((/2,2,0/),(/3,3,0/),(/'x','y','N'/),(/1,1,1/),(/nlci,nlcj,jpl*(5+nlay_s+nlay_i)/),tra_ice_id )
+   CALL agrif_declare_variable((/1,2/)    ,(/2,3/),(/'x','y'/)    ,(/1,1/)  ,(/nlci,nlcj/)                      ,u_ice_id   )
+   CALL agrif_declare_variable((/2,1/)    ,(/3,2/),(/'x','y'/)    ,(/1,1/)  ,(/nlci,nlcj/)                      ,v_ice_id   )
 
    ! 2. Set interpolations (normal & tangent to the grid cell for velocities)