Merge branch 'NOAA-EMC:develop' into mpihtousempidevelop

Author: JessicaMeixner-NOAA

CMakeLists.txt

@@ -16,6 +16,13 @@ if(hasParent)
   # Unset flags that come from Parent (ie UFS or other coupled build)
   # for potential (-r8/-r4) conflict
   set(CMAKE_Fortran_FLAGS "")
+  if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
+    set(CMAKE_Fortran_FLAGS_DEBUG "-check all -check noarg_temp_created -ftrapuv")
+  elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(IntelLLVM)$")
+    set(CMAKE_Fortran_FLAGS_DEBUG "-check all -check noarg_temp_created -ftrapuv")
+  else()
+    message(WARNING "Fortran compiler with ID ${CMAKE_Fortran_COMPILER_ID} will be used with CMake default options")
+  endif()
   set(CMAKE_C_FLAGS "")
   remove_definitions(-DDEBUG)
 endif()

model/src/w3fld1md.F90

@@ -586,12 +586,12 @@ SUBROUTINE W3FLD1( ASPC, FPI, WNDX,WNDY, ZWND,               &
         Z2=NKT
         UP1(ZI) = ( ( ( WN(Z2)**2 / DELTA ) * FTILDE(z2) ) + &
              ( DAIR / ( ZOFK(Z2) * KAPPA ) ) * ( SQRT( &
-             TLTN(ZI)**2 + TLTE(ZI)**2 ) / DAIR )**(3/2) ) &
+             TLTN(ZI)**2 + TLTE(ZI)**2 ) / DAIR )**(1.5) ) &
              * ( TLTE(ZI) ) / ( TLTE(ZI) * TAUX &
              + TLTN(ZI) * TAUY )
         VP1(ZI) = ( ( ( WN(Z2)**2 / DELTA ) * FTILDE(z2) ) + &
              ( DAIR / ( ZOFK(Z2) * KAPPA ) ) * ( SQRT ( &
-             TLTN(ZI)**2 + TLTE(ZI)**2 ) / DAIR )**(3/2) ) &
+             TLTN(ZI)**2 + TLTE(ZI)**2 ) / DAIR )**(1.5) ) &
              * ( TLTN(ZI) ) / ( TLTE(ZI) * TAUX &
              + TLTN(ZI) * TAUY )
         UP(ZI) = UP1(ZI)