Changeset 12156

Timestamp:

2019-12-10T16:02:00+01:00 (5 years ago)

Author:

davestorkey

Message:

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

File:

• NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traatf.F90 (modified) (2 diffs)

NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traatf.F90

@@ -317 +317 @@
                   ENDIF
                   !
-                  IF( ll_rnf .AND. jk <= nk_rnf(ji,jj) )                                          &
-                     &     ztc_f  = ztc_f  - zfact1 * ( rnf_tsc(ji,jj,jn) - rnf_tsc_b(ji,jj,jn) ) & 
-                     &                              * e3t(ji,jj,jk,Kmm) / h_rnf(ji,jj)
-
                   !
                   ! solar penetration (temperature only)
@@ -326 +322 @@
                      &     ztc_f  = ztc_f  - zfact1 * ( qsr_hc(ji,jj,jk) - qsr_hc_b(ji,jj,jk) ) 
                      !
+                  !
+                  IF( ll_rnf .AND. jk <= nk_rnf(ji,jj) )                                          &
+                     &     ztc_f  = ztc_f  - zfact1 * ( rnf_tsc(ji,jj,jn) - rnf_tsc_b(ji,jj,jn) ) & 
+                     &                              * e3t(ji,jj,jk,Kmm) / h_rnf(ji,jj)
+
                   !
                   ! ice shelf