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

Changeset 12156


Ignore:
Timestamp:
2019-12-10T16:02:00+01:00 (4 years ago)
Author:
davestorkey
Message:

2019/dev_r11943_MERGE_2019: revert order of calculation in traatf.F90 to maintain bit comparison with trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traatf.F90

    r12150 r12156  
    317317                  ENDIF 
    318318                  ! 
    319                   IF( ll_rnf .AND. jk <= nk_rnf(ji,jj) )                                          & 
    320                      &     ztc_f  = ztc_f  - zfact1 * ( rnf_tsc(ji,jj,jn) - rnf_tsc_b(ji,jj,jn) ) &  
    321                      &                              * e3t(ji,jj,jk,Kmm) / h_rnf(ji,jj) 
    322  
    323319                  ! 
    324320                  ! solar penetration (temperature only) 
     
    326322                     &     ztc_f  = ztc_f  - zfact1 * ( qsr_hc(ji,jj,jk) - qsr_hc_b(ji,jj,jk) )  
    327323                     ! 
     324                  ! 
     325                  IF( ll_rnf .AND. jk <= nk_rnf(ji,jj) )                                          & 
     326                     &     ztc_f  = ztc_f  - zfact1 * ( rnf_tsc(ji,jj,jn) - rnf_tsc_b(ji,jj,jn) ) &  
     327                     &                              * e3t(ji,jj,jk,Kmm) / h_rnf(ji,jj) 
     328 
    328329                  ! 
    329330                  ! ice shelf 
Note: See TracChangeset for help on using the changeset viewer.