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 10023 for NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/TRA/trasbc.F90 – NEMO

Ignore:
Timestamp:
2018-08-02T08:19:03+02:00 (6 years ago)
Author:
gm
Message:

#1911 (ENHANCE-04): RK3 branch - step II.2 bug correction in dynnxt + domvvl_RK3 creation

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/TRA/trasbc.F90

    r10009 r10023  
    122122      ENDIF 
    123123      !                             !==  Now sbc tracer content fields  ==! 
    124       DO jj = 2, jpj 
    125          DO ji = fs_2, fs_jpim1   ! vector opt. 
    126             IF ( ll_wd ) THEN     ! If near WAD point limit the flux for now 
    127                IF ( ssh(ji,jj,Nnn) + ht_0(ji,jj) >  2._wp * rn_wdmin1 ) THEN 
     124      ! 
     125      IF ( ll_wd ) THEN                   !* WAD case:  If near WAD point limit the flux for now 
     126         DO jj = 2, jpj 
     127            DO ji = fs_2, fs_jpim1   ! vector opt. 
     128               IF     ( ssh(ji,jj,Nnn) + ht_0(ji,jj) >  2._wp * rn_wdmin1 ) THEN 
    128129                  sbc_tsc(ji,jj,jp_tem) = r1_rho0_rcp * qns(ji,jj)   ! non solar heat flux 
    129                ELSE IF ( ssh(ji,jj,Nnn) + ht_0(ji,jj) >  rn_wdmin1 ) THEN 
     130               ELSEIF ( ssh(ji,jj,Nnn) + ht_0(ji,jj) >  rn_wdmin1 ) THEN 
    130131                  sbc_tsc(ji,jj,jp_tem) = r1_rho0_rcp * qns(ji,jj) & 
    131132                     &                  * tanh ( 5._wp * ( ( ssh(ji,jj,Nnn) + ht_0(ji,jj) - rn_wdmin1 ) * r_rn_wdmin1 ) ) 
     
    133134                  sbc_tsc(ji,jj,jp_tem) = 0._wp 
    134135               ENDIF 
    135             ELSE  
     136               sbc_tsc(ji,jj,jp_sal) = r1_rho0     * sfx(ji,jj)   ! salt flux due to freezing/melting 
     137            END DO 
     138         END DO 
     139      ELSE                                !* standard case 
     140         DO jj = 2, jpj 
     141            DO ji = fs_2, fs_jpim1   ! vector opt. 
    136142               sbc_tsc(ji,jj,jp_tem) = r1_rho0_rcp * qns(ji,jj)   ! non solar heat flux 
    137             ENDIF 
    138  
    139             sbc_tsc(ji,jj,jp_sal) = r1_rho0     * sfx(ji,jj)   ! salt flux due to freezing/melting 
    140          END DO 
    141       END DO 
     143               sbc_tsc(ji,jj,jp_sal) = r1_rho0     * sfx(ji,jj)   ! salt flux due to freezing/melting 
     144            END DO 
     145         END DO 
     146      ENDIF 
     147      ! 
    142148      IF( ln_linssh ) THEN                !* linear free surface   
    143149         DO jj = 2, jpj                         !==>> add concentration/dilution effect due to constant volume cell 
Note: See TracChangeset for help on using the changeset viewer.