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 10874 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/DYN/dynadv.F90 – NEMO

Ignore:
Timestamp:
2019-04-15T15:57:37+02:00 (5 years ago)
Author:
davestorkey
Message:

branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps : Revert all changes so far in preparation for implementation of new design.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/DYN/dynadv.F90

    r10789 r10874  
    5353CONTAINS 
    5454 
    55    SUBROUTINE dyn_adv( kt, ktlev1, ktlev2, pu_rhs, pv_rhs ) 
     55   SUBROUTINE dyn_adv( kt ) 
    5656      !!--------------------------------------------------------------------- 
    5757      !!                  ***  ROUTINE dyn_adv  *** 
    … …  
    6767      !!---------------------------------------------------------------------- 
    6868      INTEGER, INTENT( in ) ::   kt   ! ocean time-step index 
    69       INTEGER, INTENT( in ) ::   ktlev1, ktlev2   ! time level indices for source terms 
    70       REAL(wp), INTENT( inout), DIMENSION(jpi,jpj,jpk) :: pu_rhs, pv_rhs ! momentum trends 
    7169      !!---------------------------------------------------------------------- 
    7270      ! 
    … …  
    7573      SELECT CASE( n_dynadv )    !==  compute advection trend and add it to general trend  ==! 
    7674      CASE( np_VEC_c2  )      
    77          CALL dyn_keg     ( kt, ktlev2, nn_dynkeg, pu_rhs, pv_rhs )    ! vector form : horizontal gradient of kinetic energy 
    78          CALL dyn_zad     ( kt, ktlev2,            pu_rhs, pv_rhs )    ! vector form : vertical advection 
     75         CALL dyn_keg     ( kt, nn_dynkeg )    ! vector form : horizontal gradient of kinetic energy 
     76         CALL dyn_zad     ( kt )               ! vector form : vertical advection 
    7977      CASE( np_FLX_c2  )  
    80          CALL dyn_adv_cen2( kt, ktlev2,            pu_rhs, pv_rhs )    ! 2nd order centered scheme 
     78         CALL dyn_adv_cen2( kt )               ! 2nd order centered scheme 
    8179      CASE( np_FLX_ubs )    
    82          CALL dyn_adv_ubs ( kt, ktlev1, ktlev2,    pu_rhs, pv_rhs )               ! 3rd order UBS      scheme (UP3) 
     80         CALL dyn_adv_ubs ( kt )               ! 3rd order UBS      scheme (UP3) 
    8381      END SELECT 
    8482      ! 
Note: See TracChangeset for help on using the changeset viewer.