Ignore:
Timestamp:
2019-11-22T15:29:17+01:00 (22 months ago)
Author:
acc
Message:

Merge in changes from 2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps. This just creates a fresh copy of this branch to use as the merge base. See ticket #2341

Location:
NEMO/branches/2019/dev_r11943_MERGE_2019/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r11943_MERGE_2019/src

    • Property svn:mergeinfo deleted
  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/NST/agrif_user.F90

    r11536 r11949  
    5353   ! 
    5454   CALL nemo_init       !* Initializations of each fine grid 
     55   Kbb_a = Nbb; Kmm_a = Nnn; Krhs_a = Nrhs   ! agrif_oce module copies of time level indices 
    5556 
    5657   !                    !* Agrif initialization 
     
    175176   tabspongedone_tsn = .FALSE. 
    176177   CALL Agrif_Bc_variable(tsn_sponge_id,calledweight=1.,procname=interptsn_sponge) 
    177    ! reset tsa to zero 
    178    tsa(:,:,:,:) = 0. 
     178   ! reset ts(:,:,:,:,Krhs_a) to zero 
     179   ts(:,:,:,:,Krhs_a) = 0. 
    179180 
    180181   Agrif_UseSpecialValue = ln_spc_dyn 
     
    191192   CALL Agrif_Bc_variable(sshn_id,calledweight=1., procname=interpsshn ) 
    192193   hbdy_w(:,:) = 0.e0 ; hbdy_e(:,:) = 0.e0 ; hbdy_n(:,:) = 0.e0 ; hbdy_s(:,:) = 0.e0 
    193    ssha(:,:) = 0.e0 
     194   ssh(:,:,Krhs_a) = 0.e0 
    194195 
    195196   IF ( ln_dynspg_ts ) THEN 
     
    207208   Agrif_UseSpecialValue = .FALSE.  
    208209   ! reset velocities to zero 
    209    ua(:,:,:) = 0. 
    210    va(:,:,:) = 0. 
     210   uu(:,:,:,Krhs_a) = 0. 
     211   vv(:,:,:,Krhs_a) = 0. 
    211212 
    212213   ! 3. Some controls 
     
    591592   tabspongedone_trn = .FALSE. 
    592593   CALL Agrif_Bc_variable(trn_sponge_id,calledweight=1.,procname=interptrn_sponge) 
    593    ! reset tsa to zero 
    594    tra(:,:,:,:) = 0. 
     594   ! reset ts(:,:,:,:,Krhs_a) to zero 
     595   tr(:,:,:,:,Krhs_a) = 0. 
    595596 
    596597 
     
    624625      ENDIF 
    625626 
    626       ! Check passive tracer cell 
    627       IF( nn_dttrc .NE. 1 ) THEN 
    628          WRITE(*,*) 'nn_dttrc should be equal to 1' 
    629       ENDIF 
    630627   ENDIF 
    631628   ! 
Note: See TracChangeset for help on using the changeset viewer.