diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3aa49cd7a..6096c8824 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -445,6 +445,33 @@ elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
 
   # Additional options
   # -fdefault-integer-8: Use it to set precision to 8 bytes for integer, don't use it for the standard case of pInt=4 (there is no -fdefault-integer-4)
+
+
+###################################################################################################
+# PGI Compiler
+###################################################################################################
+elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "PGI")
+
+  if (OPTIMIZATION STREQUAL "OFF")
+    set (OPTIMIZATION_FLAGS "-O0"       )
+  elseif (OPTIMIZATION STREQUAL "DEFENSIVE")
+    set (OPTIMIZATION_FLAGS "-O2")
+  elseif (OPTIMIZATION STREQUAL "AGGRESSIVE")
+    set (OPTIMIZATION_FLAGS "-O3")
+  endif ()
+
+
+#------------------------------------------------------------------------------------------------
+# Fine tuning compilation options
+  set (COMPILE_FLAGS "${COMPILE_FLAGS} -Mpreprocess")
+  # preprocessor
+
+  set (STANDARD_CHECK "-Mallocatable=03")
+
+#------------------------------------------------------------------------------------------------
+# Runtime debugging
+  set (DEBUG_FLAGS "${DEBUG_FLAGS} -g")
+  # Includes debugging information in the object module; sets the optimization level to zero unless a -⁠O option is present on the command line
 else ()
   message (FATAL_ERROR "Compiler type (CMAKE_Fortran_COMPILER_ID) not recognized")
 endif ()
diff --git a/src/compilation_info.f90 b/src/compilation_info.f90
index f0ca4d4cc..77d181a38 100644
--- a/src/compilation_info.f90
+++ b/src/compilation_info.f90
@@ -1,9 +1,13 @@
+! https://github.com/jeffhammond/HPCInfo/blob/master/docs/Preprocessor-Macros.md
 #if defined(__GFORTRAN__) || __INTEL_COMPILER >= 1800
   write(6,*) 'Compiled with ', compiler_version()
   write(6,*) 'With options  ', compiler_options()
-#else
+#elif defined(__INTEL_COMPILER)
   write(6,'(a,i4.4,a,i8.8)') ' Compiled with Intel fortran version ', __INTEL_COMPILER,&
                                                      ', build date ', __INTEL_COMPILER_BUILD_DATE
+#elif defined(__PGI)
+  write(6,'(a,i4.4,a,i8.8)') ' Compiled with PGI fortran version ', __PGIC__,&
+                                                               '.', __PGIC_MINOR__
 #endif
 write(6,*) 'Compiled on ', __DATE__,' at ',__TIME__
 write(6,*)
diff --git a/src/math.f90 b/src/math.f90
index 28c7175e3..4d7736b31 100644
--- a/src/math.f90
+++ b/src/math.f90
@@ -118,6 +118,9 @@ module math
 !---------------------------------------------------------------------------------------------------
 
  public :: &
+#if defined(__PGI)
+  norm2, &
+#endif
    math_init, &
    math_qsort, &
    math_expand, &
@@ -2707,4 +2710,19 @@ real(pReal) pure elemental function math_clip(a, left, right)
 
 end function math_clip
 
+
+#if defined(__PGI)
+!--------------------------------------------------------------------------------------------------
+!> @brief substitute for the norm2 intrinsic which is not available when using PGI 18.10
+!--------------------------------------------------------------------------------------------------
+real(pReal) pure function norm2(v)
+ 
+ implicit none
+ real(pReal), intent(in), dimension(3) :: v
+ 
+ norm2 = sqrt(sum(a**2))
+
+end function norm2
+#endif
+
 end module math