Changeset 13140


Ignore:
Timestamp:
2020-06-22T12:44:56+02:00 (7 weeks 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:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/dev_r12512_HPC-04_mcastril_Mixed_Precision_implementation/src/ICE/icethd_ent.F90

    r12701 r13140  
    132132      IF( compute_hfx_err ) THEN 
    133133         DO ji = 1, npti 
    134             hfx_err_rem_1d(ji) = hfx_err_rem_1d(ji) + a_i_1d(ji) * r1_rdtice *  & 
     134            hfx_err_rem_1d(ji) = hfx_err_rem_1d(ji) + a_i_1d(ji) * r1_Dt_ice *  & 
    135135               &               ( SUM( qnew(ji,1:nlay_i) ) * zhnew(ji) - SUM( eh_i_old(ji,0:nlay_i+1) ) ) 
    136136         END DO 
  • NEMO/branches/2020/dev_r12512_HPC-04_mcastril_Mixed_Precision_implementation/src/OCE/FLO/floblk.F90

    r13135 r13140  
    175175            zgidfl(jfl) = float(iioutfl(jfl) - iiinfl(jfl)) 
    176176            IF( zufl(jfl)*zuoutfl <= 0. ) THEN 
    177 <<<<<<< .working 
    178                ztxfl(jfl) = HUGE(0.0_wp) 
    179 ||||||| .merge-left.r12512 
    180                ztxfl(jfl) = 1.E99 
    181 ======= 
    182177               ztxfl(jfl) = HUGE(1._wp) 
    183 >>>>>>> .merge-right.r13134 
    184178            ELSE 
    185179               IF( ABS(zudfl(jfl)) >= 1.E-5 ) THEN 
Note: See TracChangeset for help on using the changeset viewer.