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 10922 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP – NEMO

Ignore:
Timestamp:
2019-05-02T17:10:39+02:00 (5 years ago)
Author:
acc
Message:

2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps : Convert IOM, LDF, OBS and SBC directories and compatibility changes elsewhere that these changes enforce. Changes pass SETTE and compare with original trunk results. Outstanding issues (currently with work-arounds) in DIU/step_diu.F90 and fld_bdy_interp within SBC/fldread.F90; proper soltions pending

Location:
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/TRP/trcadv.F90

    r10880 r10922  
    116116         ! 
    117117         IF( ln_ldfeiv .AND. .NOT. ln_traldf_triad )   &  
    118             &              CALL ldf_eiv_trp( kt, nittrc000, zun, zvn, zwn, 'TRC' )  ! add the eiv transport 
     118            &              CALL ldf_eiv_trp( kt, nittrc000, zun, zvn, zwn, 'TRC', Kmm )  ! add the eiv transport 
    119119         ! 
    120120         IF( ln_mle    )   CALL tra_mle_trp( kt, nittrc000, zun, zvn, zwn, 'TRC' )  ! add the mle transport 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/TRP/trcldf.F90

    r10068 r10922  
    5151CONTAINS 
    5252 
    53    SUBROUTINE trc_ldf( kt ) 
     53   SUBROUTINE trc_ldf( kt, Kmm ) 
    5454      !!---------------------------------------------------------------------- 
    5555      !!                  ***  ROUTINE tra_ldf  *** 
    … …  
    5959      !!---------------------------------------------------------------------- 
    6060      INTEGER, INTENT( in ) ::   kt   ! ocean time-step index 
     61      INTEGER, INTENT( in ) ::   Kmm  ! ocean time-level index 
    6162      ! 
    6263      INTEGER            :: ji, jj, jk, jn 
    … …  
    9798         CALL tra_ldf_iso  ( kt, nittrc000,'TRC', zahu, zahv, gtru, gtrv, gtrui, gtrvi, trb, trb, tra, jptra,    1     ) 
    9899      CASE ( np_lap_it )                              ! laplacian : triad iso-neutral operator (griffies) 
    99          CALL tra_ldf_triad( kt, nittrc000,'TRC', zahu, zahv, gtru, gtrv, gtrui, gtrvi, trb, trb, tra, jptra,    1    ) 
     100         CALL tra_ldf_triad( kt, nittrc000,'TRC', zahu, zahv, gtru, gtrv, gtrui, gtrvi, trb, trb, tra, jptra,    1    , Kmm ) 
    100101      CASE ( np_blp , np_blp_i , np_blp_it )          ! bilaplacian: all operator (iso-level, -neutral) 
    101          CALL tra_ldf_blp  ( kt, nittrc000,'TRC', zahu, zahv, gtru, gtrv, gtrui, gtrvi, trb     , tra, jptra, nldf_trc ) 
     102         CALL tra_ldf_blp  ( kt, nittrc000,'TRC', zahu, zahv, gtru, gtrv, gtrui, gtrvi, trb     , tra, jptra, nldf_trc, Kmm ) 
    102103      END SELECT 
    103104      ! 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/TRP/trctrp.F90

    r10884 r10922  
    7373         ENDIF 
    7474         !                                                       
    75                                 CALL trc_ldf    ( kt )      ! lateral mixing 
     75                                CALL trc_ldf    ( kt, Kmm ) ! lateral mixing 
    7676#if defined key_agrif 
    7777         IF(.NOT. Agrif_Root()) CALL Agrif_Sponge_trc       ! tracers sponge 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/trcstp.F90

    r10905 r10922  
    8787      IF( l_trcdm2dc )   CALL trc_mean_qsr( kt ) 
    8888      !     
    89       IF( nn_dttrc /= 1 )   CALL trc_sub_stp( kt )  ! averaging physical variables for sub-stepping 
     89      IF( nn_dttrc /= 1 )   CALL trc_sub_stp( kt, Kmm )  ! averaging physical variables for sub-stepping 
    9090      !     
    9191      IF( MOD( kt , nn_dttrc ) == 0 ) THEN      ! only every nn_dttrc time step 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/trcsub.F90

    r10425 r10922  
    8282CONTAINS 
    8383 
    84    SUBROUTINE trc_sub_stp( kt ) 
     84   SUBROUTINE trc_sub_stp( kt, Kmm ) 
    8585      !!------------------------------------------------------------------- 
    8686      !!                     ***  ROUTINE trc_stp  *** 
    … …  
    9292      !!------------------------------------------------------------------- 
    9393      INTEGER, INTENT( in ) ::   kt   ! ocean time-step index 
     94      INTEGER, INTENT( in ) ::   Kmm  ! ocean time-level index 
    9495      ! 
    9596      INTEGER ::   ji, jj, jk   ! dummy loop indices 
    … …  
    282283         ENDIF 
    283284         ! 
    284          CALL trc_sub_ssh( kt )         ! after ssh & vertical velocity 
     285         CALL trc_sub_ssh( kt, Kmm )         ! after ssh & vertical velocity 
    285286         ! 
    286287      ENDIF 
    … …  
    445446 
    446447 
    447    SUBROUTINE trc_sub_ssh( kt )  
     448   SUBROUTINE trc_sub_ssh( kt, Kmm )  
    448449      !!---------------------------------------------------------------------- 
    449450      !!                ***  ROUTINE trc_sub_ssh  *** 
    … …  
    464465      !!---------------------------------------------------------------------- 
    465466      INTEGER, INTENT(in) ::   kt   ! time step 
     467      INTEGER, INTENT(in) ::   Kmm  ! ocean time-level index 
    466468      ! 
    467469      INTEGER  ::   ji, jj, jk   ! dummy loop indices 
    … …  
    484486      ! 
    485487!!gm BUG here !   hdivn will include the runoff divergence at the wrong timestep !!!! 
    486       CALL div_hor( kt )                              ! Horizontal divergence & Relative vorticity 
     488      CALL div_hor( kt, Kmm )                         ! Horizontal divergence & Relative vorticity 
    487489      ! 
    488490      z2dt = 2._wp * rdt                              ! set time step size (Euler/Leapfrog) 
Note: See TracChangeset for help on using the changeset viewer.