New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 9058 – NEMO

Changeset 9058


Ignore:
Timestamp:
2017-12-14T16:52:57+01:00 (7 years ago)
Author:
jchanut
Message:

Correct TKE/GLS key removal with AGRIF

Location:
branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_oce.F90

    r9031 r9058  
    2626   REAL(wp), PUBLIC ::   rn_sponge_dyn = 2800.     !: sponge coeff. for dynamics 
    2727   LOGICAL , PUBLIC ::   ln_chk_bathy  = .FALSE.   !: check of parent bathymetry  
    28    LOGICAL , PUBLIC ::   lk_agrif_clp  = .TRUE.    !: Force clamped bcs 
     28   LOGICAL , PUBLIC ::   lk_agrif_clp  = .FALSE.   !: Force clamped bcs 
    2929   !                                              !!! OLD namelist names 
    3030   REAL(wp), PUBLIC ::   visc_tra                  !: sponge coeff. for tracers 
  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/NST_SRC/agrif_user.F90

    r9031 r9058  
    411411   CALL agrif_declare_variable((/2,2/),(/ind3,ind3/),(/'x','y'/),(/1,1/),(/nlci,nlcj/),sshn_id) 
    412412 
    413    IF( ln_zdftke ) THEN 
    414       CALL agrif_declare_variable((/2,2,0/),(/ind3,ind3,0/),(/'x','y','N'/),(/1,1,1/),(/jpi,jpj,jpk/), en_id) 
    415       CALL agrif_declare_variable((/2,2,0/),(/ind3,ind3,0/),(/'x','y','N'/),(/1,1,1/),(/jpi,jpj,jpk/),avt_id) 
     413   IF( ln_zdftke.OR.ln_zdfgls ) THEN 
     414!      CALL agrif_declare_variable((/2,2,0/),(/ind3,ind3,0/),(/'x','y','N'/),(/1,1,1/),(/jpi,jpj,jpk/), en_id) 
     415!      CALL agrif_declare_variable((/2,2,0/),(/ind3,ind3,0/),(/'x','y','N'/),(/1,1,1/),(/jpi,jpj,jpk/),avt_id) 
    416416# if defined key_vertical 
    417    CALL agrif_declare_variable((/2,2,0,0/),(/ind3,ind3,0,0/),(/'x','y','N','N'/),(/1,1,1,1/),(/jpi,jpj,jpk,2/),avm_id) 
     417      CALL agrif_declare_variable((/2,2,0,0/),(/ind3,ind3,0,0/),(/'x','y','N','N'/),(/1,1,1,1/),(/jpi,jpj,jpk,2/),avm_id) 
    418418# else 
    419    CALL agrif_declare_variable((/2,2,0,0/),(/ind3,ind3,0,0/),(/'x','y','N','N'/),(/1,1,1,1/),(/nlci,nlcj,jpk,1/),avm_id) 
     419      CALL agrif_declare_variable((/2,2,0,0/),(/ind3,ind3,0,0/),(/'x','y','N','N'/),(/1,1,1,1/),(/nlci,nlcj,jpk,1/),avm_id) 
    420420# endif 
    421421   ENDIF 
     
    444444   CALL Agrif_Set_bcinterp(vmsk_id,interp=AGRIF_constant) 
    445445 
    446    IF( ln_zdftke )   CALL Agrif_Set_bcinterp( avm_id, interp=AGRIF_linear ) 
     446   IF( ln_zdftke.OR.ln_zdfgls )   CALL Agrif_Set_bcinterp( avm_id, interp=AGRIF_linear ) 
    447447 
    448448   ! 3. Location of interpolation 
     
    466466   CALL Agrif_Set_bc( vmsk_id, (/0,ind1-1/)                  ) 
    467467 
    468    IF( ln_zdftke )   CALL Agrif_Set_bc( avm_id, (/0,ind1/) ) 
     468   IF( ln_zdftke.OR.ln_zdfgls )   CALL Agrif_Set_bc( avm_id, (/0,ind1/) ) 
    469469 
    470470   ! 4. Update type 
     
    482482   CALL Agrif_Set_Updatetype(e3t_id, update = Agrif_Update_Full_Weighting) 
    483483 
    484    IF( ln_zdftke) THEN 
    485       CALL Agrif_Set_Updatetype( en_id, update = AGRIF_Update_Full_Weighting) 
    486       CALL Agrif_Set_Updatetype(avt_id, update = AGRIF_Update_Full_Weighting) 
    487       CALL Agrif_Set_Updatetype(avm_id, update = AGRIF_Update_Full_Weighting) 
     484   IF( ln_zdftke.OR.ln_zdfgls ) THEN 
     485!      CALL Agrif_Set_Updatetype( en_id, update = AGRIF_Update_Full_Weighting) 
     486!      CALL Agrif_Set_Updatetype(avt_id, update = AGRIF_Update_Full_Weighting) 
     487!      CALL Agrif_Set_Updatetype(avm_id, update = AGRIF_Update_Full_Weighting) 
    488488   ENDIF 
    489489 
     
    498498   CALL Agrif_Set_Updatetype(e3t_id, update = AGRIF_Update_Average) 
    499499 
    500    IF( ln_zdftke) THEN 
    501       CALL Agrif_Set_Updatetype( en_id, update = AGRIF_Update_Average) 
    502       CALL Agrif_Set_Updatetype(avt_id, update = AGRIF_Update_Average) 
    503       CALL Agrif_Set_Updatetype(avm_id, update = AGRIF_Update_Average) 
     500   IF( ln_zdftke.OR.ln_zdfgls ) THEN 
     501!      CALL Agrif_Set_Updatetype( en_id, update = AGRIF_Update_Average) 
     502!      CALL Agrif_Set_Updatetype(avt_id, update = AGRIF_Update_Average) 
     503!      CALL Agrif_Set_Updatetype(avm_id, update = AGRIF_Update_Average) 
    504504   ENDIF 
    505505 
Note: See TracChangeset for help on using the changeset viewer.