Changeset 13680


Ignore:
Timestamp:
2020-10-26T23:02:27+01:00 (4 months ago)
Author:
jchanut
Message:

#2385, effectively add VORTEX ssh initialization and key_qco. Save first guess (prior update) r3x arrays: Restored correct value of surface w.

Location:
NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src/NST/agrif_oce_update.F90

    r13678 r13680  
    218218      CALL Agrif_ParentGrid_To_ChildGrid() 
    219219#else 
    220 !! JC: should be something like that:  
    221220      CALL Agrif_ChildGrid_To_ParentGrid() 
    222       CALL dom_qco_r3c( ssh(:,:,Kbb_a), r3t(:,:,Kbb_a), r3u(:,:,Kbb_a), r3v(:,:,Kbb_a) ) 
    223       CALL dom_qco_r3c( ssh(:,:,Kmm_a), r3t(:,:,Kmm_a), r3u(:,:,Kmm_a), r3v(:,:,Kmm_a), r3f(:,:) )  
     221         r3t(:,:,Krhs_a) = r3t(:,:,Kmm_a) 
     222         r3u(:,:,Krhs_a) = r3u(:,:,Kmm_a) 
     223         r3v(:,:,Krhs_a) = r3v(:,:,Kmm_a) 
     224         CALL dom_qco_zgr( Kbb_a, Kmm_a, Krhs_a ) 
    224225      CALL Agrif_ParentGrid_To_ChildGrid() 
    225226#endif 
  • NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src/OCE/DOM/domqco.F90

    r13607 r13680  
    125125#if defined key_agrif 
    126126      ! We need to define r3[tuv](Kaa) for AGRIF initialisation (should not be a problem for the restartability...) 
    127       r3t(:,:,Kaa) = r3t(:,:,Kmm) 
    128       r3u(:,:,Kaa) = r3u(:,:,Kmm) 
    129       r3v(:,:,Kaa) = r3v(:,:,Kmm) 
     127!      r3t(:,:,Kaa) = r3t(:,:,Kmm) 
     128!      r3u(:,:,Kaa) = r3u(:,:,Kmm) 
     129!      r3v(:,:,Kaa) = r3v(:,:,Kmm) 
    130130#endif 
    131131      ! 
  • NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/VORTEX/MY_SRC/domqco.F90

    r13679 r13680  
    125125#if defined key_agrif 
    126126      ! We need to define r3[tuv](Kaa) for AGRIF initialisation (should not be a problem for the restartability...) 
    127       r3t(:,:,Kaa) = r3t(:,:,Kmm) 
    128       r3u(:,:,Kaa) = r3u(:,:,Kmm) 
    129       r3v(:,:,Kaa) = r3v(:,:,Kmm) 
     127!      r3t(:,:,Kaa) = r3t(:,:,Kmm) 
     128!      r3u(:,:,Kaa) = r3u(:,:,Kmm) 
     129!      r3v(:,:,Kaa) = r3v(:,:,Kmm) 
    130130#endif 
    131131      ! 
     
    302302            ! Just to read set ssh in fact, called latter once vertical grid 
    303303            ! is set up: 
    304 !           CALL usr_def_istate( gdept_0, tmask, ts(:,:,:,:,Kbb), uu(:,:,:,Kbb), vv(:,:,:,Kbb), ssh(:,:,Kbb)  ) 
    305 !           ! 
    306             ssh(:,:,:) = 0._wp 
     304            CALL usr_def_istate( gdept_0, tmask, ts(:,:,:,:,Kbb), uu(:,:,:,Kbb), vv(:,:,:,Kbb), ssh(:,:,Kbb)  ) 
     305            ! 
     306            ssh(:,:,Kmm) = ssh(:,:,Kbb)  
    307307            ! 
    308308         ENDIF           ! end of ll_wd edits 
Note: See TracChangeset for help on using the changeset viewer.