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 4500 – NEMO

Changeset 4500


Ignore:
Timestamp:
2014-02-18T16:26:08+01:00 (10 years ago)
Author:
timgraham
Message:

Modified advection schemes as in #1242 to prevent trdtrd being called when key_trdtra is set but key_trdtrc is not set.

Location:
branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/TRA
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90

    r3294 r4500  
    161161            avmb(4) =  2.5 * avmb(4)      ;      avtb(4) =  2.5 * avtb(4) 
    162162         ENDIF 
    163          ! 
    164          l_trd = .FALSE. 
    165          IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) )   l_trd = .TRUE. 
    166163      ENDIF 
     164      ! 
     165      l_trd = .FALSE. 
     166      IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) )   l_trd = .TRUE. 
    167167      ! 
    168168      ! Upstream / centered scheme indicator 
  • branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90

    r3558 r4500  
    9090         IF(lwp) WRITE(numout,*) 'tra_adv : MUSCL advection scheme on ', cdtype 
    9191         IF(lwp) WRITE(numout,*) '~~~~~~~' 
    92          ! 
    93          l_trd = .FALSE. 
    94          IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE. 
    9592      ENDIF 
    96  
     93      ! 
     94      l_trd = .FALSE. 
     95      IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE. 
    9796      !                                                     ! =========== 
    9897      DO jn = 1, kjpt                                       ! tracer loop 
  • branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.F90

    r3558 r4500  
    8989         IF(lwp) WRITE(numout,*) 'tra_adv_muscl2 : MUSCL2 advection scheme on ', cdtype 
    9090         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~~~' 
    91          ! 
    92          l_trd = .FALSE. 
    93          IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) )   l_trd = .TRUE. 
    9491      ENDIF 
    95  
     92      ! 
     93      l_trd = .FALSE. 
     94      IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) )   l_trd = .TRUE. 
    9695      !                                                          ! =========== 
    9796      DO jn = 1, kjpt                                            ! tracer loop 
  • branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90

    r3558 r4500  
    102102         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~' 
    103103         IF(lwp) WRITE(numout,*) 
    104          ! 
    105          l_trd = .FALSE. 
    106          IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE. 
    107104      ENDIF 
    108  
     105      ! 
     106      l_trd = .FALSE. 
     107      IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE. 
     108       
    109109      ! I. The horizontal fluxes are computed with the QUICKEST + ULTIMATE scheme 
    110110      CALL tra_adv_qck_i( kt, cdtype, p2dt, pun, ptb, ptn, pta, kjpt )  
  • branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90

    r3558 r4500  
    9595         IF(lwp) WRITE(numout,*) 'tra_adv_tvd : TVD advection scheme on ', cdtype 
    9696         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~' 
    97          ! 
    98          l_trd = .FALSE. 
    99          IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE. 
    10097      ENDIF 
     98      ! 
     99      l_trd = .FALSE. 
     100      IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE. 
    101101      ! 
    102102      IF( l_trd )  THEN 
  • branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90

    r3788 r4500  
    103103         IF(lwp) WRITE(numout,*) 'tra_adv_ubs :  horizontal UBS advection scheme on ', cdtype 
    104104         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~' 
    105          ! 
    106          l_trd = .FALSE. 
    107          IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE. 
    108105      ENDIF 
     106      ! 
     107      l_trd = .FALSE. 
     108      IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE. 
    109109      ! 
    110110      !                                                          ! =========== 
Note: See TracChangeset for help on using the changeset viewer.