Ignore:
Timestamp:
2020-06-19T17:37:47+02:00 (3 months ago)
Author:
orioltp
Message:

dev_r12512_HPC-04_mcastril_Mixed_Precision_implementation: merge with trunk@13134, see #2364

Location:
NEMO/branches/2020/dev_r12512_HPC-04_mcastril_Mixed_Precision_implementation
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/dev_r12512_HPC-04_mcastril_Mixed_Precision_implementation

    • Property svn:externals
      •  

        old new  
        88 
        99# SETTE 
        10 ^/utils/CI/sette@HEAD         sette 
         10^/utils/CI/sette@12931        sette 
  • NEMO/branches/2020/dev_r12512_HPC-04_mcastril_Mixed_Precision_implementation/src/OCE/FLO/floblk.F90

    r12603 r13135  
    175175            zgidfl(jfl) = float(iioutfl(jfl) - iiinfl(jfl)) 
    176176            IF( zufl(jfl)*zuoutfl <= 0. ) THEN 
     177<<<<<<< .working 
    177178               ztxfl(jfl) = HUGE(0.0_wp) 
     179||||||| .merge-left.r12512 
     180               ztxfl(jfl) = 1.E99 
     181======= 
     182               ztxfl(jfl) = HUGE(1._wp) 
     183>>>>>>> .merge-right.r13134 
    178184            ELSE 
    179185               IF( ABS(zudfl(jfl)) >= 1.E-5 ) THEN 
     
    191197            zgjdfl(jfl) = float(ijoutfl(jfl)-ijinfl(jfl)) 
    192198            IF( zvfl(jfl)*zvoutfl <= 0. ) THEN 
    193                ztyfl(jfl) = HUGE(0.0_wp) 
     199               ztyfl(jfl) = HUGE(1._wp) 
    194200            ELSE 
    195201               IF( ABS(zvdfl(jfl)) >= 1.E-5 ) THEN 
     
    208214               zgkdfl(jfl) = float(ikoutfl(jfl) - ikinfl(jfl)) 
    209215               IF( zwfl(jfl)*zwoutfl <= 0. ) THEN 
    210                   ztzfl(jfl) = HUGE(0.0_wp) 
     216                  ztzfl(jfl) = HUGE(1._wp) 
    211217               ELSE 
    212218                  IF( ABS(zwdfl(jfl)) >= 1.E-5 ) THEN 
Note: See TracChangeset for help on using the changeset viewer.