Changeset 14495

Timestamp:

2021-02-18T18:06:18+01:00 (3 years ago)

Author:

mcastril

Message:

Further changes to make the mixed precision branch compliant with cpp -traditional and GNU compiler

Location:

NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src

Files:

• ICE/icethd_dh.F90 (modified) (1 diff)
• OCE/FLO/flodom.F90 (modified) (2 diffs)
• OCE/LBC/mpp_nfd_generic.h90 (modified) (3 diffs)
• OCE/SBC/sbcblk_algo_coare3p0.F90 (modified) (1 diff)
• OCE/TRA/traadv_fct.F90 (modified) (2 diffs)
• OCE/TRA/trabbl.F90 (modified) (4 diffs)
• OCE/ZDF/zdfmfc.F90 (modified) (1 diff)

NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/ICE/icethd_dh.F90

@@ -369 +369 @@
                !--- zswi2  if dh/dt > 3.6e-7
                zgrr     = MIN( 1.0e-3, MAX ( dh_i_bog(ji) * r1_Dt_ice , epsi10 ) )
-               zswi2    = MAX( 0._wp , SIGN( 1._wp , zgrr - 3.6e-7 ) )
-               zswi12   = MAX( 0._wp , SIGN( 1._wp , zgrr - 2.0e-8 ) ) * ( 1.0 - zswi2 )
+               zswi2    = MAX( 0._wp , SIGN( 1._wp , zgrr - 3.6e-7_wp ) )
+               zswi12   = MAX( 0._wp , SIGN( 1._wp , zgrr - 2.0e-8_wp ) ) * ( 1.0 - zswi2 )
                zswi1    = 1. - zswi2 * zswi12
                zfracs   = MIN( zswi1  * 0.12 + zswi12 * ( 0.8925 + 0.0568 * LOG( 100.0 * zgrr ) )   &

NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/FLO/flodom.F90

@@ -372 +372 @@
       LOGICAL , INTENT(out) ::  ldinmesh            ! ???
       !!
-      REAL(wp) ::   zabt, zbct, zcdt, zdat, zabpt, zbcpt, zcdpt, zdapt
+      REAL(dp) ::   zabt, zbct, zcdt, zdat, zabpt, zbcpt, zcdpt, zdapt
       !!---------------------------------------------------------------------
       !! Statement function
-      REAL(wp) ::   fsline
-      REAL(wp) ::   psax, psay, psbx, psby, psx, psy
+      REAL(dp) ::   fsline
+      REAL(dp) ::   psax, psay, psbx, psby, psx, psy
       fsline( psax, psay, psbx, psby, psx, psy ) = psy  * ( psbx - psax )   &
          &                                       - psx  * ( psby - psay )   &
@@ -389 +389 @@
       
       ! 4 semi plane defined by the 4 points and including the extrememity
-      zabpt = fsline(pax,pay,pbx,pby,px,py)
-      zbcpt = fsline(pbx,pby,pcx,pcy,px,py)
-      zcdpt = fsline(pcx,pcy,pdx,pdy,px,py)
-      zdapt = fsline(pdx,pdy,pax,pay,px,py)
+      zabpt = fsline(pax,pay,pbx,pby,CASTDP(px),CASTDP(py))
+      zbcpt = fsline(pbx,pby,pcx,pcy,CASTDP(px),CASTDP(py))
+      zcdpt = fsline(pcx,pcy,pdx,pdy,CASTDP(px),CASTDP(py))
+      zdapt = fsline(pdx,pdy,pax,pay,CASTDP(px),CASTDP(py))
        
       ! We compare the semi plane T with the semi plane including the point

NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/LBC/mpp_nfd_generic.h90

@@ +1 @@
+#  define PASTE(a) a
+#  define ADD_TRAIL_USCORE(a) PASTE(a)_
+#  define CONCATENATE(a,b) ADD_TRAIL_USCORE(a)b
+
 #if defined MULTI
 #   define NAT_IN(k)                cd_nat(k)   
@@ -67 +71 @@
 #    define RECVROUTINE mpprecv_sp
 #    define MPI_TYPE MPI_REAL
-#    define HUGEVAL(x)   HUGE(x##_sp)
+#    define HUGEVAL(x)   HUGE(CONCATENATE(x,sp))
 # else
 #    define PRECISION dp
@@ -73 +77 @@
 #    define RECVROUTINE mpprecv_dp
 #    define MPI_TYPE MPI_DOUBLE_PRECISION
-#    define HUGEVAL(x)   HUGE(x##_dp)
+#    define HUGEVAL(x)   HUGE(CONCATENATE(x,dp))
 # endif
 

NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/SBC/sbcblk_algo_coare3p0.F90

@@ -399 +399 @@
             ! Charnock's constant, increases with the wind :
             zgt10 = 0.5 + SIGN(0.5_wp,(zw - 10))  ! If zw<10. --> 0, else --> 1
-            zgt18 = 0.5 + SIGN(0.5_wp,(zw - 18.)) ! If zw<18. --> 0, else --> 1
+            zgt18 = 0.5 + SIGN(0.5_wp,(zw - 18._wp)) ! If zw<18. --> 0, else --> 1
             !
             charn_coare3p0(ji,jj) =  (1. - zgt10)*0.011    &    ! wind is lower than 10 m/s

NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/TRA/traadv_fct.F90

@@ -474 +474 @@
          zau = MIN( 1._wp, zbetdo(ji,jj,jk), zbetup(ji+1,jj,jk) )
          zbu = MIN( 1._wp, zbetup(ji,jj,jk), zbetdo(ji+1,jj,jk) )
-         zcu =       ( 0.5  + SIGN( 0.5_wp , paa(ji,jj,jk) ) )
+         zcu =       ( 0.5  + SIGN( 0.5_wp , CASTWP(paa(ji,jj,jk)) ) )
          paa(ji,jj,jk) = paa(ji,jj,jk) * ( zcu * zau + ( 1._wp - zcu) * zbu )
 
          zav = MIN( 1._wp, zbetdo(ji,jj,jk), zbetup(ji,jj+1,jk) )
          zbv = MIN( 1._wp, zbetup(ji,jj,jk), zbetdo(ji,jj+1,jk) )
-         zcv =       ( 0.5  + SIGN( 0.5_wp , pbb(ji,jj,jk) ) )
+         zcv =       ( 0.5  + SIGN( 0.5_wp , CASTWP(pbb(ji,jj,jk)) ) )
          pbb(ji,jj,jk) = pbb(ji,jj,jk) * ( zcv * zav + ( 1._wp - zcv) * zbv )
 
@@ -486 +486 @@
          za = MIN( 1., zbetdo(ji,jj,jk+1), zbetup(ji,jj,jk) )
          zb = MIN( 1., zbetup(ji,jj,jk+1), zbetdo(ji,jj,jk) )
-         zc =       ( 0.5  + SIGN( 0.5_wp , pcc(ji,jj,jk+1) ) )
+         zc =       ( 0.5  + SIGN( 0.5_wp , CASTWP(pcc(ji,jj,jk+1)) ) )
          pcc(ji,jj,jk+1) = pcc(ji,jj,jk+1) * ( zc * za + ( 1._wp - zc) * zb )
       END_3D

NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/TRA/trabbl.F90

@@ -372 +372 @@
                &      - zb * ( zts(ji+1,jj,jp_sal) - zts(ji,jj,jp_sal) )  ) * umask(ji,jj,1)
             !
-            zsign  = SIGN(  0.5_wp, -zgdrho * REAL( mgrhu(ji,jj) )  )    ! sign of ( i-gradient * i-slope )
+            zsign  = SIGN(  0.5_wp, CASTWP(-zgdrho * REAL( mgrhu(ji,jj)) )  )    ! sign of ( i-gradient * i-slope )
             ahu_bbl(ji,jj) = ( 0.5 - zsign ) * ahu_bbl_0(ji,jj)       ! masked diffusive flux coeff.
             !
@@ -382 +382 @@
                &      - zb * ( zts(ji,jj+1,jp_sal) - zts(ji,jj,jp_sal) )  ) * vmask(ji,jj,1)
             !
-            zsign = SIGN(  0.5_wp, -zgdrho * REAL( mgrhv(ji,jj) )  )     ! sign of ( j-gradient * j-slope )
+            zsign = SIGN(  0.5_wp, CASTWP(-zgdrho * REAL( mgrhv(ji,jj)) )  )     ! sign of ( j-gradient * j-slope )
             ahv_bbl(ji,jj) = ( 0.5 - zsign ) * ahv_bbl_0(ji,jj)
          END_2D
@@ -402 +402 @@
                          - zb * ( zts(ji+1,jj,jp_sal) - zts(ji,jj,jp_sal) )  ) * umask(ji,jj,1)
                !
-               zsign = SIGN(  0.5_wp, - zgdrho   * REAL( mgrhu(ji,jj) )  )   ! sign of i-gradient * i-slope
-               zsigna= SIGN(  0.5_wp, zub(ji,jj) * REAL( mgrhu(ji,jj) )  )   ! sign of u * i-slope
+               zsign = SIGN(  0.5_wp, CASTWP(- zgdrho   * REAL( mgrhu(ji,jj)) )  )   ! sign of i-gradient * i-slope
+               zsigna= SIGN(  0.5_wp, CASTWP(zub(ji,jj) * REAL( mgrhu(ji,jj)) )  )   ! sign of u * i-slope
                !
                !                                                          ! bbl velocity
@@ -414 +414 @@
                zgdrho = (  za * ( zts(ji,jj+1,jp_tem) - zts(ji,jj,jp_tem) )    &
                   &      - zb * ( zts(ji,jj+1,jp_sal) - zts(ji,jj,jp_sal) )  ) * vmask(ji,jj,1)
-               zsign = SIGN(  0.5_wp, - zgdrho   * REAL( mgrhv(ji,jj) )  )   ! sign of j-gradient * j-slope
-               zsigna= SIGN(  0.5_wp, zvb(ji,jj) * REAL( mgrhv(ji,jj) )  )   ! sign of u * i-slope
+               zsign = SIGN(  0.5_wp, CASTWP(- zgdrho   * REAL( mgrhv(ji,jj)) )  )   ! sign of j-gradient * j-slope
+               zsigna= SIGN(  0.5_wp, CASTWP(zvb(ji,jj) * REAL( mgrhv(ji,jj)) )  )   ! sign of u * i-slope
                !
                !                                                          ! bbl transport

NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/ZDF/zdfmfc.F90

@@ -181 +181 @@
          &      grav * ( 2.e-4_wp *zfnet(:,:) - 7.6E-4_wp*pts(:,:,1,jp_sal,Kmm)*zsws(:,:)/zrautb(:,:)) * zhcmo(:,:)
 
-      zedmf(:,:,1) = -0.065_wp*(ABS(zfbuo(:,:)))**(1._wp/3._wp)*SIGN(1.,zfbuo(:,:))
+      zedmf(:,:,1) = -0.065_wp*(ABS(zfbuo(:,:)))**(1._wp/3._wp)*SIGN(1._wp,zfbuo(:,:))
       zedmf(:,:,1) = MAX(0., zedmf(:,:,1))