Changeset 4499 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA
- Timestamp:
- 2014-02-18T16:14:31+01:00 (10 years ago)
- Location:
- branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90
r3718 r4499 160 160 avmb(4) = 2.5 * avmb(4) ; avtb(4) = 2.5 * avtb(4) 161 161 ENDIF 162 !163 l_trd = .FALSE.164 IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE.165 162 ENDIF 163 ! 164 l_trd = .FALSE. 165 IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE. 166 166 ! 167 167 ! Upstream / centered scheme indicator -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl.F90
r3718 r4499 115 115 ENDIF 116 116 ! 117 !118 l_trd = .FALSE.119 IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE.120 117 121 118 ! … … 137 134 ! 138 135 ENDIF 136 ! 137 l_trd = .FALSE. 138 IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE. 139 139 140 ! ! =========== 140 141 DO jn = 1, kjpt ! tracer loop -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_muscl2.F90
r3625 r4499 88 88 IF(lwp) WRITE(numout,*) 'tra_adv_muscl2 : MUSCL2 advection scheme on ', cdtype 89 89 IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~~~' 90 !91 l_trd = .FALSE.92 IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE.93 90 ENDIF 91 ! 92 l_trd = .FALSE. 93 IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE. 94 94 95 95 ! ! =========== -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90
r3625 r4499 102 102 IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~' 103 103 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.107 104 ENDIF 105 ! 106 l_trd = .FALSE. 107 IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE. 108 108 109 109 ! I. The horizontal fluxes are computed with the QUICKEST + ULTIMATE scheme -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90
r3625 r4499 93 93 IF(lwp) WRITE(numout,*) 'tra_adv_tvd : TVD advection scheme on ', cdtype 94 94 IF(lwp) WRITE(numout,*) '~~~~~~~~~~~' 95 !96 l_trd = .FALSE.97 IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE.98 95 ENDIF 96 ! 97 l_trd = .FALSE. 98 IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE. 99 99 ! 100 100 IF( l_trd ) THEN -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90
r3787 r4499 103 103 IF(lwp) WRITE(numout,*) 'tra_adv_ubs : horizontal UBS advection scheme on ', cdtype 104 104 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.108 105 ENDIF 106 ! 107 l_trd = .FALSE. 108 IF( ( cdtype == 'TRA' .AND. l_trdtra ) .OR. ( cdtype == 'TRC' .AND. l_trdtrc ) ) l_trd = .TRUE. 109 109 ! 110 110 ! ! ===========
Note: See TracChangeset
for help on using the changeset viewer.