Changeset 8306 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/NST_SRC

Timestamp:

2017-07-10T12:18:03+02:00 (7 years ago)

Author:

clem

Message:

step1: remove LIM2 from the code

Location:

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/NST_SRC

Files:

• agrif_ice.F90 (modified) (1 diff)
• agrif_lim2_interp.F90 (deleted)
• agrif_lim2_update.F90 (deleted)
• agrif_user.F90 (modified) (2 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/NST_SRC/agrif_ice.F90

@@ -7 +7 @@
    !!            3.6  ! 2016-05  (C. Rousset)   Add LIM3 compatibility
    !!----------------------------------------------------------------------
-#if defined key_agrif && defined key_lim2
-   !!----------------------------------------------------------------------
-   !!   'key_agrif'                                              AGRIF zoom
-   !!----------------------------------------------------------------------
-   USE par_oce      ! ocean parameters
-   
-   IMPLICIT NONE
-   PRIVATE 
-
-   PUBLIC agrif_ice_alloc ! routine called by nemo_init in nemogcm.F90
-
-   INTEGER, PUBLIC :: u_ice_id, v_ice_id, adv_ice_id
-   REAL(wp), PUBLIC :: lim_nbstep = 0.    ! child time position in sea-ice model
-#if defined key_lim2_vp
-   REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:)     :: u_ice_nst, v_ice_nst   
-#else
-   REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:,:)   :: u_ice_oe, u_ice_sn     !: boundaries arrays
-   REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:,:)   :: v_ice_oe, v_ice_sn     !:  "          " 
-#endif
-   REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:,:,:) :: adv_ice_oe, adv_ice_sn !:  "          "
-
-   !!----------------------------------------------------------------------
-   !! NEMO/NST 3.3.4 , NEMO Consortium (2012)
-   !! $Id$
-   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
-   !!----------------------------------------------------------------------
-
-CONTAINS 
-
-   INTEGER FUNCTION agrif_ice_alloc()
-      !!----------------------------------------------------------------------
-      !!                ***  FUNCTION agrif_ice_alloc  ***
-      !!----------------------------------------------------------------------
-#if defined key_lim2_vp
-      ALLOCATE( u_ice_nst(jpi,jpj), v_ice_nst(jpi,jpj) ,   &
-#else
-      ALLOCATE( u_ice_oe(4,jpj,2) , v_ice_oe(4,jpj,2) ,    &
-         &      u_ice_sn(jpi,4,2) , v_ice_sn(jpi,4,2) ,    &
-#endif
-         &      adv_ice_oe (4,jpj,7,2) , adv_ice_sn (jpi,4,7,2) ,   &
-         &      STAT = agrif_ice_alloc)
-
-#if ! defined key_lim2_vp
-      u_ice_oe(:,:,:) =  0.e0
-      v_ice_oe(:,:,:) =  0.e0
-      u_ice_sn(:,:,:) =  0.e0
-      v_ice_sn(:,:,:) =  0.e0
-#endif
-      adv_ice_oe (:,:,:,:) = 0.e0 
-      adv_ice_sn (:,:,:,:) = 0.e0 
-      !
-   END FUNCTION agrif_ice_alloc
-
-#elif defined key_agrif && defined key_lim3
+#if defined key_agrif && defined key_lim3
    !!----------------------------------------------------------------------
    !!   'key_agrif'                                              AGRIF zoom

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/NST_SRC/agrif_user.F90

@@ -481 +481 @@
 END SUBROUTINE agrif_declare_var
 
-#  if defined key_lim2
-SUBROUTINE Agrif_InitValues_cont_lim2
-   !!----------------------------------------------------------------------
-   !!                 *** ROUTINE Agrif_InitValues_cont_lim2 ***
-   !!
-   !! ** Purpose :: Initialisation of variables to be interpolated for LIM2
-   !!----------------------------------------------------------------------
-   USE Agrif_Util
-   USE ice_2
-   USE agrif_ice
-   USE in_out_manager
-   USE agrif_lim2_update
-   USE agrif_lim2_interp
-   USE lib_mpp
-   !!
-   IMPLICIT NONE
-   !!----------------------------------------------------------------------
-
-   ! 1. Declaration of the type of variable which have to be interpolated
-   !---------------------------------------------------------------------
-   CALL agrif_declare_var_lim2
-
-   ! 2. First interpolations of potentially non zero fields
-   !-------------------------------------------------------
-   Agrif_SpecialValue=-9999.
-   Agrif_UseSpecialValue = .TRUE.
-   !     Call Agrif_Bc_variable(zadv ,adv_ice_id ,calledweight=1.,procname=interp_adv_ice )
-   !     Call Agrif_Bc_variable(zvel ,u_ice_id   ,calledweight=1.,procname=interp_u_ice   )
-   !     Call Agrif_Bc_variable(zvel ,v_ice_id   ,calledweight=1.,procname=interp_v_ice   )
-   Agrif_SpecialValue=0.
-   Agrif_UseSpecialValue = .FALSE.
-
-   ! 3. Some controls
-   !-----------------
-
-#   if ! defined key_lim2_vp
-   lim_nbstep = 1.
-   CALL agrif_rhg_lim2_load
-   CALL agrif_trp_lim2_load
-   lim_nbstep = 0.
-#   endif
-   !RB mandatory but why ???
-   !      IF( nbclineupdate /= nn_fsbc .AND. nn_ice == 2 )THEN
-   !         CALL ctl_warn ('With ice model on child grid, nbclineupdate is set to nn_fsbc')
-   !         nbclineupdate = nn_fsbc
-   !       ENDIF
-   CALL Agrif_Update_lim2(0)
-   !
-END SUBROUTINE Agrif_InitValues_cont_lim2
-
-
-SUBROUTINE agrif_declare_var_lim2
-   !!----------------------------------------------------------------------
-   !!                 *** ROUTINE agrif_declare_var_lim2 ***
-   !!
-   !! ** Purpose :: Declaration of variables to be interpolated for LIM2
-   !!----------------------------------------------------------------------
-   USE agrif_util
-   USE ice_2
-   !!
-   IMPLICIT NONE
-   !!----------------------------------------------------------------------
-
-   ! 1. Declaration of the type of variable which have to be interpolated
-   !---------------------------------------------------------------------
-   CALL agrif_declare_variable((/2,2,0/),(/3,3,0/),(/'x','y','N'/),(/1,1,1/),(/jpi,jpj, 7/),adv_ice_id )
-#   if defined key_lim2_vp
-   CALL agrif_declare_variable((/1,1/),(/3,3/),(/'x','y'/),(/1,1/),(/jpi,jpj/),u_ice_id)
-   CALL agrif_declare_variable((/1,1/),(/3,3/),(/'x','y'/),(/1,1/),(/jpi,jpj/),v_ice_id)
-#   else
-   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)
-#   endif
-
-   ! 2. Type of interpolation
-   !-------------------------
-   CALL Agrif_Set_bcinterp(adv_ice_id ,interp=AGRIF_linear)
-   CALL Agrif_Set_bcinterp(u_ice_id,interp1=Agrif_linear,interp2=AGRIF_ppm)
-   CALL Agrif_Set_bcinterp(v_ice_id,interp1=AGRIF_ppm,interp2=Agrif_linear)
-
-   ! 3. Location of interpolation
-   !-----------------------------
-   CALL Agrif_Set_bc(adv_ice_id ,(/0,1/))
-   CALL Agrif_Set_bc(u_ice_id,(/0,1/))
-   CALL Agrif_Set_bc(v_ice_id,(/0,1/))
-
-   ! 5. Update type
-   !---------------
-   CALL Agrif_Set_Updatetype(adv_ice_id , update = AGRIF_Update_Average)
-   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
-
 #if defined key_lim3
 SUBROUTINE Agrif_InitValues_cont_lim3
@@ -902 +807 @@
    !
    IF( agrif_oce_alloc()  > 0 )   CALL ctl_warn('agrif agrif_oce_alloc: allocation of arrays failed')
-# if defined key_lim2
-   IF( agrif_ice_alloc()  > 0 )   CALL ctl_stop('agrif agrif_ice_alloc: allocation of arrays failed') ! only for LIM2 (not LIM3)
-# endif
    !
 END SUBROUTINE agrif_nemo_init