Changeset 11483


Ignore:
Timestamp:
2019-08-29T14:07:48+02:00 (22 months ago)
Author:
davestorkey
Message:

2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps : Update more header comments and change logs.
Also remove debugging output from trcstp.F90 and correct bug in step_c1d.F90. Note C1D untested in this branch.

Location:
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/C1D/step_c1d.F90

    r11480 r11483  
    66   !! History :   2.0  !  2004-04  (C. Ethe)  adapted from step.F90 for C1D 
    77   !!             3.0  !  2008-04  (G. Madec)  redo the adaptation to include SBC 
     8   !!             4.1  !  2019-08  (A. Coward, D. Storkey) rewrite in preparation for new timestepping scheme 
    89   !!---------------------------------------------------------------------- 
    910#if defined key_c1d 
     
    1920#endif 
    2021   USE dyncor_c1d      ! Coriolis term (c1d case)         (dyn_cor_1d     ) 
    21    USE dynnxt          ! time-stepping                    (dyn_nxt routine) 
     22   USE dynatf          ! time filtering                   (dyn_atf routine) 
    2223   USE dyndmp          ! U & V momentum damping           (dyn_dmp routine) 
    2324   USE restart         ! restart  
     
    133134      Naa = Nrhs 
    134135      ! 
    135       IF(.NOT.ln_linssh)CALL dom_vvl_sf_swp( kstp, Nbb, Nnn, Naa )                       ! swap of vertical scale factors 
     136      IF(.NOT.ln_linssh)CALL dom_vvl_sf_update( kstp, Nbb, Nnn, Naa )                    ! update of vertical scale factors 
    136137 
    137138      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/DOM/domvvl.F90

    r11480 r11483  
    88   !!            3.3  !  2011-10  (M. Leclair) totally rewrote domvvl: vvl option includes z_star and z_tilde coordinates 
    99   !!            3.6  !  2014-11  (P. Mathiot) add ice shelf capability 
     10   !!            4.1  !  2019-08  (A. Coward, D. Storkey) rename dom_vvl_sf_swp -> dom_vvl_sf_update for new timestepping 
    1011   !!---------------------------------------------------------------------- 
    1112 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OFF/dtadyn.F90

    r11480 r11483  
    1313   !!             3.3  ! 2010-11 (C. Ethe) Full reorganization of the off-line: phasing with the on-line 
    1414   !!             3.4  ! 2011-05 (C. Ethe) Use of fldread 
     15   !!             4.1  ! 2019-08 (A. Coward, D. Storkey) split dta_dyn_sf_swp -> dta_dyn_sf_atf and dta_dyn_sf_interp 
    1516   !!---------------------------------------------------------------------- 
    1617 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OFF/nemogcm.F90

    r11480 r11483  
    77   !!            3.4  ! 2011-01  (C. Ethe, A. R. Porter, STFC Daresbury) dynamical allocation 
    88   !!            4.0  ! 2016-10  (C. Ethe, G. Madec, S. Flavoni)  domain configuration / user defined interface 
     9   !!            4.1  ! 2019-08  (A. Coward, D. Storkey) rewrite in preparation for new timestepping scheme 
    910   !!---------------------------------------------------------------------- 
    1011 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/TRP/trcatf.F90

    r11480 r11483  
    1919   !!            3.1  !  2009-02  (G. Madec, R. Benshila)  re-introduce the vvl option 
    2020   !!            3.3  !  2010-06  (C. Ethe, G. Madec) Merge TRA-TRC 
     21   !!            4.1  !  2019-08  (A. Coward, D. Storkey) rename trcnxt.F90 -> trcatf.F90. Now only does time filtering. 
    2122   !!---------------------------------------------------------------------- 
    2223#if defined key_top 
     
    5859      !!                   ***  ROUTINE trcatf  *** 
    5960      !! 
    60       !!        !!!!!!!!!!!!!!!! REWRITE HEADER COMMENTS !!!!!!!!!!!!!! 
    61       !! 
    62       !! ** Purpose :   Compute the passive tracers fields at the  
    63       !!      next time-step from their temporal trends and swap the fields. 
     61      !! ** Purpose :   Apply the boundary condition on the after passive tracers fields and 
     62      !!      apply Asselin time filter to the now passive tracer fields if using leapfrog timestep 
    6463      !!  
    6564      !! ** Method  :   Apply lateral boundary conditions on (uu(Kaa),vv(Kaa)) through  
    6665      !!      call to lbc_lnk routine 
    67       !!   default: 
    68       !!      arrays swap 
    69       !!         (tr(Kmm)) = (tr(Kaa)) ; (tr(Kaa)) = (0,0) 
    70       !!         (tr(Kbb)) = (tr(Kmm))  
    7166      !! 
    7267      !!   For Arakawa or TVD Scheme :  
    73       !!      A Asselin time filter applied on now tracers (tr(:,:,:,:,Kmm)) to avoid 
     68      !!      A Asselin time filter applied on now tracers tr(Kmm) to avoid 
    7469      !!      the divergence of two consecutive time-steps and tr arrays 
    7570      !!      to prepare the next time_step: 
    76       !!         (tr(Kbb)) = (tr(Kmm)) + atfp [ (tr(Kbb)) + (tr(Kaa)) - 2 (tr(Kmm)) ] 
    77       !!         (tr(Kmm)) = (tr(Kaa)) ; (tr(Kaa)) = (0,0) 
    78       !! 
    79       !! 
    80       !! ** Action  : - update tr(Kbb), tr(Kmm) 
     71      !!         (tr(Kmm)) = (tr(Kmm)) + atfp [ (tr(Kbb)) + (tr(Kaa)) - 2 (tr(Kmm)) ] 
     72      !! 
     73      !! 
     74      !! ** Action  : - update tr(Kmm), tr(Kaa) 
    8175      !!---------------------------------------------------------------------- 
    8276      INTEGER                                   , INTENT( in )  :: kt             ! ocean time-step index 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/TRP/trcrad.F90

    r11480 r11483  
    66   !! History :   -   !  01-01  (O. Aumont & E. Kestenare)  Original code 
    77   !!            1.0  !  04-03  (C. Ethe)  free form F90 
     8   !!            4.1  !  08-19  (A. Coward, D. Storkey) tidy up using new time-level indices 
    89   !!---------------------------------------------------------------------- 
    910#if defined key_top 
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/trcstp.F90

    r11480 r11483  
    55   !!====================================================================== 
    66   !! History :  1.0  !  2004-03  (C. Ethe)  Original 
     7   !!            4.1  !  2019-08  (A. Coward, D. Storkey) rewrite in preparation for new timestepping scheme 
    78   !!---------------------------------------------------------------------- 
    89#if defined key_top 
     
    9293      !     
    9394      IF( nn_dttrc == 1 )  THEN 
    94          IF(lwp) WRITE(numout,*) "Kbb_oce, Kmm_oce, Kaa_oce, Krhs_oce : ",Kbb_oce, Kmm_oce, Kaa_oce, Krhs_oce 
    95          IF(lwp) WRITE(numout,*) "Nbb_trc, Nnn_trc, Naa_trc, Nrhs_trc : ",Nbb_trc, Nnn_trc, Naa_trc, Nrhs_trc 
    96          IF(lwp) CALL FLUSH(numout) 
    97          CALL mppsync()       
    9895         IF( Kmm_oce /= Nnn_trc .OR. Kaa_oce /= Naa_trc .OR. Krhs_oce /= Nrhs_trc ) THEN 
    9996            ! The nn_dttrc == 1 case depends on the OCE and TRC time indices being the same always.  
  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/tests/VORTEX/MY_SRC/domvvl.F90

    r11480 r11483  
    88   !!            3.3  !  2011-10  (M. Leclair) totally rewrote domvvl: vvl option includes z_star and z_tilde coordinates 
    99   !!            3.6  !  2014-11  (P. Mathiot) add ice shelf capability 
     10   !!            4.1  !  2019-08  (A. Coward, D. Storkey) rename dom_vvl_sf_swp -> dom_vvl_sf_update for new timestepping 
    1011   !!---------------------------------------------------------------------- 
    1112 
Note: See TracChangeset for help on using the changeset viewer.