Changeset 13140

Timestamp:

2020-06-22T12:44:56+02:00 (4 years ago)

Author:

orioltp

Message:

dev_r12512_HPC-04_mcastril_Mixed_Precision_implementation: corrections, see #2364

Location:

NEMO/branches/2020/dev_r12512_HPC-04_mcastril_Mixed_Precision_implementation/src

Files:

• ICE/icethd_ent.F90 (modified) (1 diff)
• OCE/FLO/floblk.F90 (modified) (1 diff)

NEMO/branches/2020/dev_r12512_HPC-04_mcastril_Mixed_Precision_implementation/src/ICE/icethd_ent.F90

@@ -132 +132 @@
       IF( compute_hfx_err ) THEN
          DO ji = 1, npti
-            hfx_err_rem_1d(ji) = hfx_err_rem_1d(ji) + a_i_1d(ji) * r1_rdtice *  &
+            hfx_err_rem_1d(ji) = hfx_err_rem_1d(ji) + a_i_1d(ji) * r1_Dt_ice *  &
                &               ( SUM( qnew(ji,1:nlay_i) ) * zhnew(ji) - SUM( eh_i_old(ji,0:nlay_i+1) ) )
          END DO

NEMO/branches/2020/dev_r12512_HPC-04_mcastril_Mixed_Precision_implementation/src/OCE/FLO/floblk.F90

@@ -175 +175 @@
             zgidfl(jfl) = float(iioutfl(jfl) - iiinfl(jfl))
             IF( zufl(jfl)*zuoutfl <= 0. ) THEN
-<<<<<<< .working
-               ztxfl(jfl) = HUGE(0.0_wp)
-||||||| .merge-left.r12512
-               ztxfl(jfl) = 1.E99
-=======
                ztxfl(jfl) = HUGE(1._wp)
->>>>>>> .merge-right.r13134
             ELSE
                IF( ABS(zudfl(jfl)) >= 1.E-5 ) THEN