Ignore:
Timestamp:
2019-05-24T10:27:58+02:00 (17 months ago)
Author:
davestorkey
Message:

2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap : Rewrite dynnxt.F90 and rename dynatf.F90 with time level swapping in stp. This doesn't work yet but committing for the record before I merge in Andrew's changes to the main branch.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/step.F90

    r11001 r11050  
    282282!!jc2: dynnxt must be the latest call. e3t(:,:,:,Nbb) are indeed updated in that routine 
    283283                         CALL tra_nxt       ( kstp, Nbb, Nnn, Nrhs, Naa )  ! finalize (bcs) tracer fields at next time step and swap 
    284                          CALL dyn_nxt       ( kstp, Nbb, Nnn, Naa  )  ! finalize (bcs) velocities at next time step and swap (always called after tra_nxt) 
     284                         CALL dyn_atf       ( kstp, Nbb, Nnn, Naa, uu, vv, e3t, e3u, e3v  )  ! time swapping of "now" arrays 
    285285                         CALL ssh_swp       ( kstp, Nbb, Nnn, Naa )  ! swap of sea surface height 
     286      ! 
     287      ! Swap time levels 
     288      Nrhs = Nbb 
     289      Nbb = Nnn 
     290      Nnn = Naa 
     291      Naa = Nrhs 
     292      ! 
     293      ! Update temporary pointers 
     294      CALL update_pointers( Nbb, Nnn, Naa ) 
     295 
    286296      IF(.NOT.ln_linssh) CALL dom_vvl_sf_swp( kstp, Nbb, Nnn, Naa )  ! swap of vertical scale factors 
    287297      ! 
     
    309319      ! Control 
    310320      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 
    311                          CALL stp_ctl      ( kstp, Nnn, indic ) 
     321                         CALL stp_ctl      ( kstp, Nbb, Nnn, indic ) 
    312322                          
    313323      IF( kstp == nit000 ) THEN                          ! 1st time step only 
     
    371381      gde3w_n => gde3w(:,:,:) 
    372382 
     383      ht_n => ht(:,:) 
     384 
     385      hu_b => hu(:,:,Kbb); hu_n => hu(:,:,Kmm); hu_a => hu(:,:,Kaa) 
     386      hv_b => hv(:,:,Kbb); hv_n => hv(:,:,Kmm); hv_a => hv(:,:,Kaa) 
     387 
     388      r1_hu_b => r1_hu(:,:,Kbb); r1_hu_n => r1_hu(:,:,Kmm); r1_hu_a => r1_hu(:,:,Kaa) 
     389      r1_hv_b => r1_hv(:,:,Kbb); r1_hv_n => r1_hv(:,:,Kmm); r1_hv_a => r1_hv(:,:,Kaa) 
     390 
     391 
    373392   END SUBROUTINE update_pointers 
    374393 
Note: See TracChangeset for help on using the changeset viewer.