diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e215027140..d49a1fa30ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,9 +11,7 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK )
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 ENDIF()
 if (NOT CMAKE_BUILD_TYPE)
   message(STATUS "No build type selected, default to Release")
@@ -83,7 +81,9 @@ add_subdirectory(testing)
 
 include_directories(./Roccom/include ./Rocman/include)
 add_executable(rocstar src/rocstar.C)
-target_link_libraries(rocstar Rocman Roccomf Roccom ${IRAD_LIB})
+set_source_files_properties(src/rocstar.C PROPERTIES COMPILE_FLAGS "${MPI_CXX_COMPILE_FLAGS}")
+set_target_properties(rocstar PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+target_link_libraries(rocstar Rocman Roccomf Roccom ${IRAD_LIB} ${MPI_CXX_LIBRARIES})
 
 INSTALL(TARGETS rocstar RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
 
diff --git a/Docs/Rocstar.cfg.in b/Docs/Rocstar.cfg.in
index a5136ed53d2..90331b90714 100644
--- a/Docs/Rocstar.cfg.in
+++ b/Docs/Rocstar.cfg.in
@@ -671,23 +671,7 @@ WARN_LOGFILE           = doxywarn.txt
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@ # CHANGED
-# INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/Docs \
-#                         @CMAKE_CURRENT_SOURCE_DIR@/src \
-#			 @CMAKE_CURRENT_SOURCE_DIR@/testing \
-#                         @CMAKE_CURRENT_SOURCE_DIR@/Rocburn \
-#                         @CMAKE_CURRENT_SOURCE_DIR@/Roccom \
-#			 @CMAKE_CURRENT_SOURCE_DIR@/Rocface \
-#                         @CMAKE_CURRENT_SOURCE_DIR@/RocfluidMP \
-#                         @CMAKE_CURRENT_SOURCE_DIR@/Rocfrac \
-#                         @CMAKE_CURRENT_SOURCE_DIR@/Rocman \
-#                         @CMAKE_CURRENT_SOURCE_DIR@/Rocmop \
-#			 @CMAKE_CURRENT_SOURCE_DIR@/Rocon \
-#			 @CMAKE_CURRENT_SOURCE_DIR@/Rocprep \
-#                         @CMAKE_CURRENT_SOURCE_DIR@/Rocprop \
-#                         @CMAKE_CURRENT_SOURCE_DIR@/testing/include \
-#                         @CMAKE_CURRENT_SOURCE_DIR@/testing/src \
-
+INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
diff --git a/Rocburn/CMakeLists.txt b/Rocburn/CMakeLists.txt
index ed2452facbc..31fadbeb855 100644
--- a/Rocburn/CMakeLists.txt
+++ b/Rocburn/CMakeLists.txt
@@ -8,9 +8,7 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK -DMPI)
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 ENDIF()
 find_library(HDF4_LIB df HINTS /usr/lib/hdf /usr/lib64/hdf)
 find_library(MFHDF_LIB mfhdf HINTS /usr/lib/hdf /usr/lib64/hdf)
@@ -33,7 +31,7 @@ FILE (GLOB PY9_SRCS  ./Rocburn_PY/*.f90)
 FILE (GLOB PYF_SRCS  ./Rocburn_PY/*.f)
 SET(LIB_SRCS ${CORE_SRCS} ${APN_SRCS} ${ZN_SRCS} ${PY9_SRCS} ${PYF_SRCS})
 SET(ALL_SRCS ${LIB_SRCS})
-set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC" )
+set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC ${MPI_Fortran_COMPILE_FLAGS}" )
 #set(TEST_SRCS src/MANTest.C)
 
 # rpath settings
@@ -49,6 +47,7 @@ ELSE()
   add_library(Rocburn STATIC ${LIB_SRCS})
   add_definitions( -DSTATIC_LINK )
 ENDIF()
-target_link_libraries(Rocburn Rocout Rocin Roccomf Roccom)
+target_link_libraries(Rocburn Rocout Rocin Roccomf Roccom ${MPI_Fortran_LIBRARIES})
+SET_TARGET_PROPERTIES(Rocburn PROPERTIES LINK_FLAGS "${MPI_Fortran_LINK_FLAGS}")
 
 INSTALL(TARGETS Rocburn RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
diff --git a/Roccom/CMakeLists.txt b/Roccom/CMakeLists.txt
index 538f305bbf9..5ce55643cf4 100644
--- a/Roccom/CMakeLists.txt
+++ b/Roccom/CMakeLists.txt
@@ -1,15 +1,6 @@
 cmake_minimum_required (VERSION 2.8)
 project(Roccom)
 ENABLE_LANGUAGE( CXX Fortran )
-IF(NOT ENABLE_MPI)
-  add_definitions( -DDUMMY_MPI )
-ELSE()
-  FIND_PACKAGE(MPI REQUIRED)
-  add_definitions( -DMPICH_IGNORE_CXX_SEEK )
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
-ENDIF()
 include(FortranCInterface)
 FortranCInterface_HEADER(${PROJECT_SOURCE_DIR}/include/FC.h MACRO_NAMESPACE "FC_")
 FortranCInterface_VERIFY(CXX QUIET)
@@ -19,11 +10,21 @@ set (EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single directo
 set (LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib CACHE PATH "Single directory for all libraries and archives.")
 mark_as_advanced (LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH)
 
+IF(NOT ENABLE_MPI)
+  add_definitions( -DDUMMY_MPI )
+ELSE()
+  FIND_PACKAGE(MPI REQUIRED)
+  add_definitions( -DMPICH_IGNORE_CXX_SEEK )
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
+ENDIF()
+
 #INCLUDE(CTest)
 
 find_library(DL_LIB dl)
 set (LIB_SRCS src/roccom_c.C src/assertion.C src/roccom_exception.C src/commpi.C src/Roccom_base.C src/Attribute.C src/Connectivity.C src/Window.C src/Pane.C src/Element_accessors.C)
+set_source_files_properties(${LIB_SRCS} src/roccom_f.C PROPERTIES COMPILE_FLAGS "${MPI_CXX_COMPILE_FLAGS}" )
 set (FLIB_SRCS src/roccom_f.C src/m_pointers.f90 src/utilities.f90)
+set_source_files_properties(src/m_pointers.f90 src/utilities.f90 PROPERTIES COMPILE_FLAGS "${MPI_Fortran_COMPILE_FLAGS}")
 set (ALL_SRCS "${LIB_SRCS} ${FLIB_SRCS}")
 set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC" )
 #set(TEST_SRCS src/COMTest.C)
@@ -34,15 +35,22 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 include_directories(include)
 
-add_library(Roccomf STATIC ${FLIB_SRCS})
 
 IF(NOT BUILD_STATIC)
   add_library(Roccom SHARED ${LIB_SRCS})
+  add_library(Roccomf SHARED ${FLIB_SRCS})
 ELSE()
-  add_library(Roccomf STATIC ${LIB_SRCS})
+  add_library(Roccom STATIC ${LIB_SRCS})
+  add_library(Roccomf STATIC ${FLIB_SRCS})
   add_definitions( -DSTATIC_LINK )
 ENDIF()
-target_link_libraries(Roccom ${DL_LIB})
+target_link_libraries(Roccom ${DL_LIB} ${MPI_CXX_LIBRARIES})
+target_link_libraries(Roccomf ${MPI_Fortran_LIBRARIES})
+
+IF(MPI_LINK_FLAGS)
+  SET_TARGET_PROPERTIES(Roccom PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+  SET_TARGET_PROPERTIES(Roccomf PROPERTIES LINK_FLAGS "${MPI_Fortran_LINK_FLAGS}")
+ENDIF()
 
 add_subdirectory(Rocblas)
 add_subdirectory(Rocin)
diff --git a/Roccom/Rocblas/CMakeLists.txt b/Roccom/Rocblas/CMakeLists.txt
index 9b1d637d23b..99f666e32d6 100644
--- a/Roccom/Rocblas/CMakeLists.txt
+++ b/Roccom/Rocblas/CMakeLists.txt
@@ -15,6 +15,7 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK )
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 #  IF(MPI_CXX_COMPILER)
 #    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
 #  ENDIF(MPI_CXX_COMPILER)
@@ -27,7 +28,7 @@ find_library(DL_LIB dl)
 set (BLASLIB_SRCS src/Rocblas.C src/axpy.C src/dots.C src/op2args.C src/op3args.C)
 set (ALL_BLAS_SRCS "${BLASLIB_SRCS}")
 set (TEST_SRCS test/blastest.C)
-set_source_files_properties(${ALL_BLAS_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC" )
+set_source_files_properties(${ALL_BLAS_SRCS} ${TEST_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC ${MPI_CXX_COMPILE_FLAGS}" )
 #set(TEST_SRCS src/COMTest.C)
 
 # rpath settings
@@ -42,10 +43,14 @@ ELSE()
   add_library(Rocblas STATIC ${LIB_SRCS})
   add_definitions( -DSTATIC_LINK )
 ENDIF()
-target_link_libraries(Rocblas Roccom)
+target_link_libraries(Rocblas Roccom ${MPI_CXX_LIBRARIES})
 
 add_executable(blastest ${TEST_SRCS})
-target_link_libraries(blastest Rocblas)
+target_link_libraries(blastest Rocblas ${MPI_CXX_LIBRARIES})
+
+IF(MPI_LINK_FLAGS)
+  SET_TARGET_PROPERTIES(Rocblas blastest PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+ENDIF()
 
 #ADD_TEST(RunAllTests ${EXECUTABLE_OUTPUT_PATH}/testx testresults.txt)
 #ADD_TEST(TestObject:ValidHandle ${TEST_RESULTS} TestObject:ValidHandle testresults.txt)
diff --git a/Roccom/Rocin/CMakeLists.txt b/Roccom/Rocin/CMakeLists.txt
index 0fd75dc8036..bf30e089f46 100644
--- a/Roccom/Rocin/CMakeLists.txt
+++ b/Roccom/Rocin/CMakeLists.txt
@@ -17,9 +17,7 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK )
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 ENDIF()
 IF(ENABLE_CGNS)
   add_definitions ( -DUSE_CGNS )
@@ -56,7 +54,7 @@ ENDIF()
 set (ALL_SRCS "${ROCIN_SRCS} ${TEST_SRCS} ${UTIL_SRCS} ${RHDF4_SRCS}")
 set(LIB_SRCS ${ROCIN_SRCS})
 #set (TEST_SRCS test/maptest.C)
-set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC" )
+set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC ${MPI_CXX_COMPILE_FLAGS}" )
 #set(TEST_SRCS src/COMTest.C)
 
 # rpath settings
@@ -82,6 +80,7 @@ target_link_libraries(Rocin Roccom)
 IF(USE_PTHREADS)
   target_link_libraries(Rocin PTHREAD_LIB)
 ENDIF()
+target_link_libraries(Rocin ${MPI_CXX_LIBRARIES})
 
 # Test executables
 add_executable(intest1 test/intest1.C)
@@ -106,6 +105,10 @@ add_executable(sepin util/sepin.C)
 target_link_libraries(sepin Rocin)
 add_executable(plagprep util/plagprep.C)
 target_link_libraries(plagprep Rocin)
+IF(MPI_LINK_FLAGS)
+  SET_TARGET_PROPERTIES(Rocin intest1 intest2 printin param_test hdf2plt printfeas hdf2vtk sepin plagprep PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+ENDIF()
+
 
 #ADD_TEST(RunAllTests ${EXECUTABLE_OUTPUT_PATH}/testx testresults.txt)
 #ADD_TEST(TestObject:ValidHandle ${TEST_RESULTS} TestObject:ValidHandle testresults.txt)
diff --git a/Roccom/Rocmap/CMakeLists.txt b/Roccom/Rocmap/CMakeLists.txt
index 562dc4589c9..83075553386 100644
--- a/Roccom/Rocmap/CMakeLists.txt
+++ b/Roccom/Rocmap/CMakeLists.txt
@@ -15,9 +15,7 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK )
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 ENDIF()
 
 #INCLUDE(CTest)
@@ -32,7 +30,7 @@ set (UTIL_SRCS util/addpconn.C)
 set (ALL_MAP_SRCS "${MAPLIB_SRCS} ${UTIL_SRCS}")
 
 #set (TEST_SRCS test/maptest.C)
-set_source_files_properties(${ALL_MAP_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC" )
+set_source_files_properties(${ALL_MAP_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC ${MPI_CXX_COMPILE_FLAGS}" )
 #set(TEST_SRCS src/COMTest.C)
 
 # rpath settings
@@ -47,7 +45,7 @@ ELSE()
   add_library(Rocmap STATIC ${LIB_SRCS})
   add_definitions( -DSTATIC_LINK )
 ENDIF()
-target_link_libraries(Rocmap Rocin Rocout Roccom)
+target_link_libraries(Rocmap Rocin Rocout Roccom ${MPI_CXX_LIBRARIES})
 
 add_executable(pconntest test/pconntest.C)
 target_link_libraries(pconntest Rocmap)
@@ -63,6 +61,12 @@ add_executable(bordertest_struc test/bordertest_struc.C)
 target_link_libraries(bordertest_struc Rocmap)
 add_executable(addpconn util/addpconn.C)
 target_link_libraries(addpconn Rocmap)
+
+IF(MPI_LINK_FLAGS)
+  SET_TARGET_PROPERTIES(Rocmap pconntest pcommtest pcommpartest bordertest_hex bordertestg_hex
+    bordertest_struc addpconn PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+ENDIF()
+
 #ADD_TEST(RunAllTests ${EXECUTABLE_OUTPUT_PATH}/testx testresults.txt)
 #ADD_TEST(TestObject:ValidHandle ${TEST_RESULTS} TestObject:ValidHandle testresults.txt)
 #ADD_TEST(TestObject:Exists ${TEST_RESULTS} TestObject:Exists testresults.txt)
diff --git a/Roccom/Rocout/CMakeLists.txt b/Roccom/Rocout/CMakeLists.txt
index cc3ea5f0e34..520cf64f27a 100644
--- a/Roccom/Rocout/CMakeLists.txt
+++ b/Roccom/Rocout/CMakeLists.txt
@@ -14,9 +14,7 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK )
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 ENDIF()
 IF(ENABLE_CGNS)
   add_definitions ( -DUSE_CGNS )
@@ -50,7 +48,7 @@ set (UTIL_SRCS util/ghostbuster.C)
 set (ALL_SRCS "${ROCOUT_SRCS} ${TEST_SRCS} ${UTIL_SRCS}")
 set(LIB_SRCS ${ROCOUT_SRCS})
 #set (TEST_SRCS test/maptest.C)
-set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC" )
+set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC ${MPI_CXX_COMPILE_FLAGS}" )
 #set(TEST_SRCS src/COMTest.C)
 
 # rpath settings
@@ -74,12 +72,16 @@ ENDIF()
 #IF(USE_PTHREADS)
 #  target_link_libraries(Rocout PTHREAD_LIB)
 #ENDIF()
-target_link_libraries(Rocout Rocin)
+target_link_libraries(Rocout Rocin ${MPI_CXX_LIBRARIES})
 
 
 # Test executables
 add_executable(outtest test/outtest.C)
-target_link_libraries(outtest Rocout)
+target_link_libraries(outtest Rocout ${MPI_CXX_LIBRARIES})
+
+IF(MPI_LINK_FLAGS)
+  SET_TARGET_PROPERTIES(Rocout outtest PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+ENDIF()
 #add_executable(inouttest test/inouttest.C)
 #target_link_libraries(inouttest Rocout)
 #add_executable(param_outtest test/param_outtest.C)
@@ -88,7 +90,10 @@ target_link_libraries(outtest Rocout)
 # Utilities
 IF(USE_CGNS)
   add_executable(ghostbuster util/ghostbuster.C)
-  target_link_libraries(ghostbuster Rocout)
+  target_link_libraries(ghostbuster Rocout ${MPI_CXX_LIBRARIES})
+  IF(MPI_LINK_FLAGS)
+    SET_TARGET_PROPERTIES(ghostbuster PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+  ENDIF()
 ENDIF()
 
 #ADD_TEST(RunAllTests ${EXECUTABLE_OUTPUT_PATH}/testx testresults.txt)
diff --git a/Roccom/Rocsurf/CMakeLists.txt b/Roccom/Rocsurf/CMakeLists.txt
index e5752882b91..9f36f521cba 100644
--- a/Roccom/Rocsurf/CMakeLists.txt
+++ b/Roccom/Rocsurf/CMakeLists.txt
@@ -13,9 +13,7 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK )
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 ENDIF()
 
 #INCLUDE(CTest)
@@ -29,7 +27,7 @@ set (TEST_SRCS test/surfmap.C test/surftest1.C test/surftest2.C test/imtest.C te
 set (ALL_SURF_SRCS "${SURFLIB_SRCS} ${TEST_SRCS}")
 
 #set (TEST_SRCS test/surftest.C)
-set_source_files_properties(${ALL_SURF_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC" )
+set_source_files_properties(${ALL_SURF_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC ${MPI_CXX_COMPILE_FLAGS}" )
 #set(TEST_SRCS src/COMTest.C)
 
 # rpath settings
@@ -44,33 +42,35 @@ ELSE()
   add_library(Rocsurf STATIC ${LIB_SRCS})
   add_definitions( -DSTATIC_LINK )
 ENDIF()
-target_link_libraries(Rocsurf Rocmap Rocblas Rocout)
-
-set (TEST_SRCS test/surfmap.C test/surftest1.C test/surftest2.C test/imtest.C test/im2hdf.C test/smf2hdf.C test/neu2hdf.C
-     test/mcntest.C test/obj2hdf.C test/msh2hdf.C test/serialize.C)
+target_link_libraries(Rocsurf Rocmap Rocblas Rocout ${MPI_CXX_LIBRARIES})
 
 add_executable(surfmap test/surfmap.C)
-target_link_libraries(surfmap Rocsurf)
+target_link_libraries(surfmap Rocsurf ${MPI_CXX_LIBRARIES} )
 add_executable(surftest1 test/surftest1.C)
-target_link_libraries(surftest1 Rocsurf)
+target_link_libraries(surftest1 Rocsurf ${MPI_CXX_LIBRARIES})
 add_executable(surftest2 test/surftest2.C)
-target_link_libraries(surftest2 Rocsurf)
+target_link_libraries(surftest2 Rocsurf ${MPI_CXX_LIBRARIES})
 add_executable(imtest test/imtest.C)
-target_link_libraries(imtest Rocsurf)
+target_link_libraries(imtest Rocsurf ${MPI_CXX_LIBRARIES})
 add_executable(im2hdf test/im2hdf.C)
-target_link_libraries(im2hdf Rocsurf)
+target_link_libraries(im2hdf Rocsurf ${MPI_CXX_LIBRARIES})
 add_executable(smf2hdf test/smf2hdf.C)
-target_link_libraries(smf2hdf Rocsurf)
+target_link_libraries(smf2hdf Rocsurf ${MPI_CXX_LIBRARIES})
 add_executable(neu2hdf test/neu2hdf.C)
-target_link_libraries(neu2hdf Rocsurf)
+target_link_libraries(neu2hdf Rocsurf ${MPI_CXX_LIBRARIES})
 add_executable(mcntest test/mcntest.C)
-target_link_libraries(mcntest Rocsurf)
+target_link_libraries(mcntest Rocsurf ${MPI_CXX_LIBRARIES})
 add_executable(obj2hdf test/obj2hdf.C)
-target_link_libraries(obj2hdf Rocsurf)
+target_link_libraries(obj2hdf Rocsurf ${MPI_CXX_LIBRARIES})
 add_executable(msh2hdf test/msh2hdf.C)
-target_link_libraries(msh2hdf Rocsurf)
+target_link_libraries(msh2hdf Rocsurf ${MPI_CXX_LIBRARIES})
 add_executable(serialize test/serialize.C)
-target_link_libraries(serialize Rocsurf)
+target_link_libraries(serialize Rocsurf ${MPI_CXX_LIBRARIES})
+
+IF(MPI_LINK_FLAGS)
+  SET_TARGET_PROPERTIES(Rocsurf surfmap surftest1 surftest2 imtest im2hdf
+    smf2hdf neu2hdf mcntest obj2hdf msh2hdf serialize PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+ENDIF()
 
 #ADD_TEST(RunAllTests ${EXECUTABLE_OUTPUT_PATH}/testx testresults.txt)
 #ADD_TEST(TestObject:ValidHandle ${TEST_RESULTS} TestObject:ValidHandle testresults.txt)
diff --git a/Rocface/CMakeLists.txt b/Rocface/CMakeLists.txt
index 6aec9ccb3dc..a4009f238cf 100644
--- a/Rocface/CMakeLists.txt
+++ b/Rocface/CMakeLists.txt
@@ -7,9 +7,7 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK )
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 ENDIF()
 
 #INCLUDE(CTest)
@@ -24,13 +22,13 @@ set (RFC_SRCS src/Base/RFC_Window_base.C src/Base/RFC_Window_base_IO.C src/Base/
               src/Transfer/Transfer_2f.C src/Transfer/Transfer_2n.C src/Rocface.C)
 #              src/Base/writer.C src/Base/rfc_assertions.C)
 #              src/Transfer/Transfer_2f.C src/Transfer/Transfer_2n.C src/Rocface.C src/Overlay/Triangulation.C 
-set (TEST_SRCS test/ex1.C test/ex2.C test/ex3.C test/ex4.C test/ex5.C test/plot3d.C test/reptrans.C test/readsdv.C)
+set (TEST_SRCS test/ex1.C test/ex2.C test/ex3.C test/ex4.C test/ex5.C test/plot3d.C test/reptrans.C test/readsdv.C test/ex6DataTransfer.C test/meshio.C)
 set (UTIL_SRCS util/surfdiver.C util/rfctest.C util/autosurfer.C util/surfjumper.C util/surfextractor.C)
 set (CGAL_SRCS CGAL/src/Color.C CGAL/src/Double.C CGAL/src/Origin.C CGAL/src/aff_transformation_tags.C CGAL/src/assertions.C CGAL/src/io.C)
 set (LIB_SRCS ${RFC_SRCS} ${CGAL_SRCS})
 set (ALL_SRCS ${LIB_SRCS} ${TEST_SRCS} ${UTIL_SRCS})
 
-set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC" )
+set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC ${MPI_CXX_COMPILE_FLAGS}" )
 #set(TEST_SRCS src/MANTest.C)
 
 # rpath settings
@@ -46,7 +44,7 @@ ELSE()
   add_library(Rocface STATIC ${LIB_SRCS})
   add_definitions( -DSTATIC_LINK )
 ENDIF()
-target_link_libraries(Rocface Rocsurf Rocmap Rocsurf Roccom)
+target_link_libraries(Rocface Rocsurf Rocmap Rocsurf Roccom ${MPI_CXX_LIBRARIES})
 
 add_executable(ex1 test/ex1.C test/meshio.C)
 add_executable(ex2 test/ex2.C test/meshio.C)
@@ -78,6 +76,22 @@ target_link_libraries(surfjumper Rocface)
 add_executable(surfextractor util/surfextractor.C)
 target_link_libraries(surfextractor Rocface)
 
+SET_TARGET_PROPERTIES(Rocface PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(ex1 PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(ex2 PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(ex3 PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(ex4 PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(ex5 PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(ex6DataTransfer PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(plot3d PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(reptrans PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(readsdv PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(surfdiver PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(rfctest PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(autosurfer PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(surfjumper PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(surfextractor PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+
 #ADD_TEST(RunAllTests ${EXECUTABLE_OUTPUT_PATH}/testx testresults.txt)
 #ADD_TEST(TestObject:ValidHandle ${TEST_RESULTS} TestObject:ValidHandle testresults.txt)
 #ADD_TEST(TestObject:Exists ${TEST_RESULTS} TestObject:Exists testresults.txt)
diff --git a/RocfluidMP/Rocflo/CMakeLists.txt b/RocfluidMP/Rocflo/CMakeLists.txt
index b9f1890adf2..91d736bfb63 100644
--- a/RocfluidMP/Rocflo/CMakeLists.txt
+++ b/RocfluidMP/Rocflo/CMakeLists.txt
@@ -18,9 +18,7 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK -DMPI)
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 ENDIF()
 find_library(HDF4_LIB df HINTS /usr/lib/hdf /usr/lib64/hdf)
 find_library(MFHDF_LIB mfhdf HINTS /usr/lib/hdf /usr/lib64/hdf)
@@ -598,7 +596,7 @@ ENDIF()
 IF(SPEC)
   add_definitions(-DSPEC)
 ENDIF()
-
+SET_SOURCE_FILES_PROPERTIES(${LIB_SRCS} PROPERTIES COMPILE_FLAGS "${MPI_Fortran_COMPILE_FLAGS}")
 #
 #UTIL_OBJ=hash_table.o read.a write.a util.o
 #OBJ= adj.o face.o buildface.o split.o volume.o 
@@ -616,6 +614,8 @@ ENDIF()
 SET(MAKEFLO_DIR ../utilities/rocflo/makeflo)
 FILE(GLOB MAKEFLO_CPP_FILES ${MAKEFLO_DIR}/*.cpp)
 FILE(GLOB MAKEFLO_F90_FILES ${MAKEFLO_DIR}/*.f90)
+set_source_files_properties(${MAKEFLO_CPP_FILES} PROPERTIES COMPILE_FLAGS "${MPI_CXX_COMPILE_FLAGS}")
+set_source_files_properties(${MAKEFLO_F90_FILES} PROPERTIES COMPILE_FLAGS "${MPI_Fortran_COMPILE_FLAGS}")
 SET(MAKEFLO_READ_SRCS ${MAKEFLO_DIR}/read.cpp ${MAKEFLO_DIR}/readgrd.cpp ${MAKEFLO_DIR}/readreg.cpp
                       ${MAKEFLO_DIR}/readmsh.f90 ${MAKEFLO_DIR}/readhdf.cpp)
 SET(MAKEFLO_WRITE_SRCS ${MAKEFLO_DIR}/write.cpp ${MAKEFLO_DIR}/writemsh.f90 ${MAKEFLO_DIR}/writehdf.cpp
@@ -644,7 +644,7 @@ ELSE()
   add_library(Rocflo STATIC ${LIB_SRCS})
   add_definitions( -DSTATIC_LINK )
 ENDIF()
-target_link_libraries(Rocflo Roccomf Roccom)
+target_link_libraries(Rocflo Roccomf Roccom ${MPI_CXX_LIBRARIES} ${MPI_Fortran_LIBRARIES})
 
 #add_library(makeflofio ${MAKEFLO_DIR}/readmsh.f90 ${MAKEFLO_DIR}/writemsh.f90 ${MAKEFLO_DIR}/writegrda.f90 ${MAKEFLO_DIR}/writegrdb.f90)
 #add_library(read ${MAKEFLO_DIR}/read.cpp ${MAKEFLO_DIR}/readgrd.cpp ${MAKEFLO_DIR}/readreg.cpp ${MAKEFLO_DIR}/readhdf.cpp)
@@ -652,14 +652,20 @@ target_link_libraries(Rocflo Roccomf Roccom)
 #add_library(write ${MAKEFLO_DIR}/write.cpp ${MAKEFLO_DIR}/writehdf.cpp)
 #target_link_libraries(write ${CMAKE_Fortran_STANDARD_LIBRARIES})
 add_executable(makeflo ${MAKEFLO_DIR}/makeflo.cpp ${MAKEFLO_CORE_SRCS} ${MAKEFLO_DIR}/read.cpp ${MAKEFLO_DIR}/readgrd.cpp ${MAKEFLO_DIR}/readreg.cpp ${MAKEFLO_DIR}/readhdf.cpp ${MAKEFLO_DIR}/write.cpp ${MAKEFLO_DIR}/writehdf.cpp ${MAKEFLO_DIR}/readmsh.f90 ${MAKEFLO_DIR}/writemsh.f90 ${MAKEFLO_DIR}/writegrda.f90 ${MAKEFLO_DIR}/writegrdb.f90)
-target_link_libraries(makeflo ${MFHDF_LIB} ${HDF4_LIB} ${JPEG_LIB} ${ZLIB})
+target_link_libraries(makeflo ${MFHDF_LIB} ${HDF4_LIB} ${JPEG_LIB} ${ZLIB} ${MPI_CXX_LIBRARIES} ${MPI_Fortran_LIBRARIES})
 add_executable(makemblock ${MAKEFLO_DIR}/makemblock.cpp ${MAKEFLO_CORE_SRCS} ${MAKEFLO_DIR}/read.cpp ${MAKEFLO_DIR}/readgrd.cpp ${MAKEFLO_DIR}/readreg.cpp ${MAKEFLO_DIR}/readhdf.cpp ${MAKEFLO_DIR}/write.cpp ${MAKEFLO_DIR}/writehdf.cpp ${MAKEFLO_DIR}/readmsh.f90 ${MAKEFLO_DIR}/writemsh.f90 ${MAKEFLO_DIR}/writegrda.f90 ${MAKEFLO_DIR}/writegrdb.f90)
-target_link_libraries(makemblock ${MFHDF_LIB} ${HDF4_LIB} ${JPEG_LIB} ${ZLIB})
+target_link_libraries(makemblock ${MFHDF_LIB} ${HDF4_LIB} ${JPEG_LIB} ${ZLIB} ${MPI_CXX_LIBRARIES} ${MPI_Fortran_LIBRARIES})
 add_executable(simpleblock ${MAKEFLO_DIR}/simpleblock.cpp ${MAKEFLO_CORE_SRCS} ${MAKEFLO_DIR}/read.cpp ${MAKEFLO_DIR}/readgrd.cpp ${MAKEFLO_DIR}/readreg.cpp ${MAKEFLO_DIR}/readhdf.cpp ${MAKEFLO_DIR}/write.cpp ${MAKEFLO_DIR}/writehdf.cpp ${MAKEFLO_DIR}/readmsh.f90 ${MAKEFLO_DIR}/writemsh.f90 ${MAKEFLO_DIR}/writegrda.f90 ${MAKEFLO_DIR}/writegrdb.f90)
-target_link_libraries(simpleblock ${MFHDF_LIB} ${HDF4_LIB} ${JPEG_LIB} ${ZLIB})
+target_link_libraries(simpleblock ${MFHDF_LIB} ${HDF4_LIB} ${JPEG_LIB} ${ZLIB} ${MPI_CXX_LIBRARIES} ${MPI_Fortran_LIBRARIES})
 add_executable(rfloprep ${FLOPREP_SRCS})
 set_property(TARGET rfloprep PROPERTY LINKER_LANGUAGE Fortran)
-target_link_libraries(rfloprep Rocflo Rocout Rocin Roccomf Roccom)
+target_link_libraries(rfloprep Rocflo Rocout Rocin Roccomf Roccom ${MPI_CXX_LIBRARIES} ${MPI_Fortran_LIBRARIES})
+
+set_target_properties(Rocflo PROPERTIES LINK_FLAGS "${MPI_Fortran_LINK_FLAGS}")
+set_target_properties(makemblock PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS} ${MPI_Fortran_LINK_FLAGS}")
+set_target_properties(simpleblock PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS} ${MPI_Fortran_LINK_FLAGS}")
+set_target_properties(rfloprep PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS} ${MPI_Fortran_LINK_FLAGS}")
+set_target_properties(makeflo PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS} ${MPI_Fortran_LINK_FLAGS}")
 
 # Unit test programs
 #read.tst: $(RTST) read.cpp
diff --git a/RocfluidMP/Rocflu/CMakeLists.txt b/RocfluidMP/Rocflu/CMakeLists.txt
index ea840cc3573..6cddc51a4e6 100644
--- a/RocfluidMP/Rocflu/CMakeLists.txt
+++ b/RocfluidMP/Rocflu/CMakeLists.txt
@@ -12,15 +12,15 @@ set (INRT    FALSE CACHE BOOL "Enable Particle Interactions")
 set (RADI    FALSE CACHE BOOL "Enable Radiation")
 set (SPEC    FALSE CACHE BOOL "Enable Species")
 add_definitions(-DNO_TECPLOT -DRFLU)
+
 IF(NOT ENABLE_MPI)
   add_definitions( -DDUMMY_MPI )
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK -DMPI)
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 ENDIF()
+
 FIND_PACKAGE(BLAS REQUIRED)
 FIND_PACKAGE(LAPACK REQUIRED)
 find_library(HDF4_LIB df HINTS /usr/lib/hdf /usr/lib64/hdf)
@@ -31,11 +31,12 @@ find_path(HDF4_INC hdf.h HINTS /usr/include/hdf)
 find_library(METIS_LIB metis)
 find_path(METIS_INC metis.h)
 #INCLUDE(CTest)
-find_path(ROCCOM_INC roccom.h HINTS ../../Roccom/include) 
+find_path(ROCCOM_INC roccom.h HINTS ../../Roccom/include)
 find_path(ROCMAN_INC rocman.h HINTS ../../Rocman/include)
 
 FILE (GLOB CORE_SRCS ../rocflu/*.F90)
-SET (LIBFLOFLU_SRCS 
+
+SET (LIBFLOFLU_SRCS
   ../libfloflu/AfterUpdateMP.F90
   ../libfloflu/BcondFarfieldPerf.F90
   ../libfloflu/BcondInflowPerf.F90
@@ -129,7 +130,7 @@ SET (LIBFLOFLU_SRCS
 IF(STATS)
   LIST (APPEND LIBFLOFLU_SRCS ../libfloflu/ReadStatisticSection.F90)
 ENDIF()
-SET (LIBFLU_SRCS 
+SET (LIBFLU_SRCS
   ../libflu/clop.C
   ../libflu/RFLU_AllocateMemoryTbc.F90
   ../libflu/RFLU_BuildDataStruct.F90
@@ -194,6 +195,7 @@ SET (LIBFLU_SRCS
   ../libflu/RFLU_UserInput.F90
   ../libflu/RFLU_WriteRestartInfo.F90
   ../libflu/RFLU_ZeroVirtualCellVars.F90)
+
 IF (STATS)
   SET (LIBFLU_SRCS ${LIBFLU_SRCS} ../libflu/RFLU_ReadStat.F90
     ../libflu/RFLU_WriteStat.F90)
@@ -226,7 +228,7 @@ SET ( MODFLOFLU_SRCS
   ../modfloflu/ModSpecies.F90
   ../modfloflu/ModStencil.F90
   ../modfloflu/ModTools.F90
-  ../modfloflu/ModTurbulence.F90 
+  ../modfloflu/ModTurbulence.F90
   ../modfloflu/ModBorder.F90
   ../modfloflu/ModColoring.F90
   ../modfloflu/ModPlotting.F90)
@@ -234,7 +236,7 @@ SET ( MODFLOFLU_SRCS
 IF(ROCSTAR)
   LIST (APPEND MODFLOFLU_SRCS ../modfloflu/ModRocstar.F90 )
 ENDIF()
-IF(INRT)                
+IF(INRT)
   LIST (APPEND MODFLOFLU_SRCS ../modfloflu/ModInterfacesInteract.F90 )
 ENDIF()
 IF(PEUL)
@@ -244,7 +246,7 @@ IF(PLAG)
   LIST (APPEND MODFLOFLU_SRCS ../modfloflu/ModInterfacesLagrangian.F90 )
 ENDIF()
 IF(PERI)
-  LIST (APPEND MODFLOFLU_SRCS ../modfloflu/ModInterfacesPeriodic.F90 ) 		
+  LIST (APPEND MODFLOFLU_SRCS ../modfloflu/ModInterfacesPeriodic.F90 )
 ENDIF()
 IF(RADI)
   LIST (APPEND MODFLOFLU_SRCS ../modfloflu/ModInterfacesRadiation.F90 )
@@ -254,14 +256,14 @@ IF(SPEC)
 ENDIF()
 IF(STATS)
   LIST (APPEND MODFLOFLU_SRCS ../modfloflu/ModInterfacesStatistics.F90
-    ../modfloflu/ModStatsRoutines.F90 
+    ../modfloflu/ModStatsRoutines.F90
     ../modfloflu/ModStatsPost.F90)
 ENDIF()
 IF(TURB)
-  LIST (APPEND MODFLOFLU_SRCS ../modfloflu/ModInterfacesTurbulence.F90 )  		
+  LIST (APPEND MODFLOFLU_SRCS ../modfloflu/ModInterfacesTurbulence.F90 )
 ENDIF()
 
-SET (MODFLU_SRCS 
+SET (MODFLU_SRCS
   ../modflu/RFLU_ModAllocateMemory.F90
   ../modflu/RFLU_ModAUSMFlux.F90
   ../modflu/RFLU_ModBessel.F90
@@ -357,7 +359,7 @@ ENDIF()
 IF(STATS)
   LIST (APPEND MODFLO_SRCS ../modflo/RFLO_ModStatsBoundaryConditions.F90 )
 ENDIF()
-SET (TURB_SRCS 
+SET (TURB_SRCS
   ../rocturb/TURB_ModInterfaces.F90
   ../rocturb/TURB_ModParameters.F90
   ../rocturb/TURB_AllocateMemory.F90
@@ -435,10 +437,10 @@ SET (TURB_SRCS
 IF(STATS)
   LIST (APPEND TURB_SRCS   ../rocturb/TURB_StatCCollector.F90
     ../rocturb/TURB_StatFCollector.F90
-    ../rocturb/TURB_StatMapping.F90 )                
+    ../rocturb/TURB_StatMapping.F90 )
 ENDIF()
 
-SET(RADI_SRCS 
+SET(RADI_SRCS
   ../rocrad/RADI_ModInterfaces.F90
   ../rocrad/RADI_ModParameters.F90
   ../rocrad/RADI_AllocateMemory.F90
@@ -475,7 +477,7 @@ SET(RADI_SRCS
   ../rocrad/RADI_SourceTerms.F90
   ../rocrad/RADI_UserInput.F90)
 
-SET(PLAG_SRCS 
+SET(PLAG_SRCS
   ../rocpart/PLAG_BuildVersionString.F90
   ../rocpart/PLAG_ModCheckVars.F90
   ../rocpart/PLAG_ModDataStruct.F90
@@ -583,7 +585,7 @@ SET(GLOB INRT_SRCS
   ../rocinteract/INRT_SourceTerms.F90
   ../rocinteract/INRT_UserInput.F90
   ../rocinteract/INRT_VaporEnergyConversion.F90)
-SET(ROCSTAR_SRCS 
+SET(ROCSTAR_SRCS
   ../rocstar/RFLU_CheckCouplingInput.F90
   ../rocstar/RFLU_GetBoundaryValues.F90
   ../rocstar/RFLU_GetDeformation.F90
@@ -621,7 +623,7 @@ SET(INIT_SRCS ../utilities/rocflu/init/main.C
   ../utilities/rocflu/init/RFLU_WriteVersionString.F90
   ../utilities/rocflu/init/rfluinit.F90
   ../libflu/dcuhre.f)
-  
+
 SET(PART_SRCS ../utilities/rocflu/part/main.C
   ../utilities/rocflu/part/RFLU_ModCENTAUR.F90
   ../utilities/rocflu/part/RFLU_ModCOBALT.F90
@@ -645,7 +647,10 @@ SET(MAP_SRCS ../utilities/rocflu/map/main.C
   ../utilities/rocflu/map/rflumap.F90
   ../libflu/dcuhre.f)
 
-SET(LIB_SRCS ${MODFLU_SRCS} ${MODFLOFLU_SRCS} ${LIBFLU_SRCS} ${LIBFLOFLU_SRCS} 
+SET_SOURCE_FILES_PROPERTIES(../utilities/rocflu/map/main.C ../utilities/rocflu/part/main.C
+  ../utilities/rocflu/init/main.C ../libflu/clop.C PROPERTIES COMPILE_FLAGS "-fPIC ${MPI_CXX_COMPILE_FLAGS}")
+
+SET(LIB_SRCS ${MODFLU_SRCS} ${MODFLOFLU_SRCS} ${LIBFLU_SRCS} ${LIBFLOFLU_SRCS}
   ${CORE_SRCS})
 IF(ROCSTAR)
   add_definitions(-DROCSTAR -DGENX)
@@ -682,7 +687,7 @@ IF(SPEC)
 ENDIF()
 
 SET(ALL_SRCS ${LIB_SRCS} ${INIT_SRCS} ${PART_SRCS} ${MAP_SRCS})
-
+SET_SOURCE_FILES_PROPERTIES(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "${MPI_Fortran_COMPILE_FLAGS}")
 # rpath settings
 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
@@ -696,17 +701,18 @@ ELSE()
   add_definitions( -DSTATIC_LINK )
 ENDIF()
 SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" )
-target_link_libraries(Rocflu Rocmop Roccomf Roccom ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+target_link_libraries(Rocflu Rocmop Roccomf Roccom ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} ${MPI_Fortran_LIBRARIES})
 
 add_executable(rfluinit ${INIT_SRCS})
-target_link_libraries(rfluinit Rocflu Rocmop Rocout Rocin Roccomf Roccom)
+target_link_libraries(rfluinit Rocflu Rocmop Rocout Rocin Roccomf Roccom ${MPI_Fortran_LIBRARIES} ${MPI_CXX_LIBRARIES})
 
 add_executable(rflupart ${PART_SRCS})
-target_link_libraries(rflupart Rocflu Rocmop Rocout Rocin Roccomf Roccom ${METIS_LIB})
+target_link_libraries(rflupart Rocflu Rocmop Rocout Rocin Roccomf Roccom ${METIS_LIB} ${MPI_Fortran_LIBRARIES} ${MPI_CXX_LIBRARIES})
 
 add_executable(rflumap ${MAP_SRCS})
-target_link_libraries(rflumap Rocflu Rocmop Rocout Rocin Roccomf Roccom)
+target_link_libraries(rflumap Rocflu Rocmop Rocout Rocin Roccomf Roccom ${MPI_Fortran_LIBRARIES} ${MPI_CXX_LIBRARIES})
 
+SET_TARGET_PROPERTIES(Rocflu rfluinit rflupart rflumap PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS} ${MPI_Fortran_LINK_FLAGS}")
 #target_link_libraries(makeflo read write ${MFHDF_LIB} ${HDF4_LIB} ${JPEG_LIB} ${ZLIB})
 #target_link_libraries(rfloprep Rocflo Rocout Rocin Roccomf Roccom)
 
diff --git a/Rocman/CMakeLists.txt b/Rocman/CMakeLists.txt
index 3d1a1535909..d8abbc26d4b 100644
--- a/Rocman/CMakeLists.txt
+++ b/Rocman/CMakeLists.txt
@@ -7,9 +7,7 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK )
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 ENDIF()
 
 #INCLUDE(CTest)
@@ -20,7 +18,7 @@ set (LIB_SRCS src/rocstar_driver.C src/Action.C src/Scheduler.C src/Coupling.C s
               src/derived_couplings.C src/Surfdiver.C src/FluidAgent.C)
 set (ALL_SRCS ${LIB_SRCS})
 
-set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC" )
+set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC ${MPI_CXX_COMPILE_FLAGS}" )
 #set(TEST_SRCS src/MANTest.C)
 
 # rpath settings
@@ -36,7 +34,8 @@ ELSE()
   add_library(Rocman STATIC ${LIB_SRCS})
   add_definitions( -DSTATIC_LINK )
 ENDIF()
-target_link_libraries(Rocman Roccom)
+target_link_libraries(Rocman Roccom ${MPI_CXX_LIBRARIES})
+set_target_properties(Rocman PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
 
 #add_executable(testx ${TEST_SRCS})
 #target_link_libraries(testx MAN ${APPUTIL_LIB})
diff --git a/Rocmop/CMakeLists.txt b/Rocmop/CMakeLists.txt
index 1a8f72cce81..d6ad3f1be24 100644
--- a/Rocmop/CMakeLists.txt
+++ b/Rocmop/CMakeLists.txt
@@ -7,9 +7,7 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK )
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 ENDIF()
 
 #INCLUDE(CTest)
@@ -32,7 +30,7 @@ set (TEST_SRCS test/add_aspect_ratios.C test/build_meshes.C test/metric_demo.C
                test/smooth_volume.C)
 set (ALL_SRCS ${LIB_SRCS} ${TEST_SRCS} ${UTIL_SRCS})
 
-set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC" )
+set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC ${MPI_CXX_COMPILE_FLAGS}" )
 #set(TEST_SRCS src/MANTest.C)
 
 # rpath settings
@@ -62,7 +60,7 @@ ELSE()
   add_definitions( -DSTATIC_LINK )
 ENDIF()
 add_dependencies(Rocmop MSQ_MV)
-target_link_libraries(Rocmop Rocsurf Rocmap Rocblas Rocout Rocin Roccom mesquite_95 m)
+target_link_libraries(Rocmop Rocsurf Rocmap Rocblas Rocout Rocin Roccom mesquite_95 m ${MPI_CXX_LIBRARIES})
 
 #set (UTIL_SRCS util/chkPconnGRecv.cc util/RocMeshData.cc)
 #set (TEST_SRCS test/add_aspect_ratios.C test/build_meshes.C test/metric_demo.C 
@@ -79,6 +77,12 @@ target_link_libraries(build_meshes Rocmop)
 target_link_libraries(metric_demo Rocmop)
 target_link_libraries(smooth_volume Rocmop)
 
+SET_TARGET_PROPERTIES(Rocmop PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(add_aspect_ratios PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(build_meshes PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(metric_demo PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(smooth_volume PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+
 #ADD_TEST(RunAllTests ${EXECUTABLE_OUTPUT_PATH}/testx testresults.txt)
 #ADD_TEST(TestObject:ValidHandle ${TEST_RESULTS} TestObject:ValidHandle testresults.txt)
 #ADD_TEST(TestObject:Exists ${TEST_RESULTS} TestObject:Exists testresults.txt)
diff --git a/Rocon/CMakeLists.txt b/Rocon/CMakeLists.txt
index 4aec604bab2..a6ed9124cbf 100644
--- a/Rocon/CMakeLists.txt
+++ b/Rocon/CMakeLists.txt
@@ -7,29 +7,21 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK )
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 ENDIF()
 
 #INCLUDE(CTest)
-find_path(ROCCOM_INC roccom.h HINTS ../Roccom/include) 
+find_path(ROCCOM_INC roccom.h HINTS ../Roccom/include)
 
-set (LIB_SRCS src/Rocon.C src/ray-triangle.C src/GEM.C 
+set (LIB_SRCS src/Rocon.C src/ray-triangle.C src/GEM.C
               src/GeoPartFunctions.C src/Partition.C
               src/RemeshFunctions.C src/RocfluFunctions.C
               src/TRAIL.C src/TRAIL_UnixUtils.C src/TransferFunctions.C
               src/PMesh.C src/BSMesh.C src/Mesh.C src/GeoPrimitives.C)
-#set (LIB_SRCS src/Rocon.C src/ray-triangle.C src/GEM.C src/UnixUtils.C 
-              #src/GeoPartFunctions.C src/Parameters.C src/Partition.C src/ComLine.C
-              #src/primitive_utilities.C src/RemeshFunctions.C src/RocfluFunctions.C
-              #src/TRAIL.C src/TRAIL_UnixUtils.C src/TransferFunctions.C src/Profiler.C
-              #src/PMesh.C src/BSMesh.C src/Mesh.C src/GeoPrimitives.C src/COMM.C)
 set (UTIL_SRCS src/flotsam.C src/genflu.C src/wrl2hdf.C)
-#set (UTIL_SRCS src/flotsam.C src/genflu.C src/wrl2hdf.C src/profane.C)
 set (ALL_SRCS ${LIB_SRCS} ${UTIL_SRCS})
 
-set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC" )
+set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC ${MPI_CXX_COMPILE_FLAGS}" )
 #set(TEST_SRCS src/MANTest.C)
 
 # rpath settings
@@ -45,7 +37,7 @@ ELSE()
   add_library(Rocon STATIC ${LIB_SRCS})
   add_definitions( -DSTATIC_LINK )
 ENDIF()
-target_link_libraries(Rocon Roccom ${IRAD_LIB})
+target_link_libraries(Rocon Roccom ${IRAD_LIB} ${MPI_CXX_LIBRARIES})
 
 add_executable(flotsam src/flotsam.C)
 add_executable(genflu  src/genflu.C )
@@ -57,6 +49,9 @@ target_link_libraries(genflu  Rocon)
 #target_link_libraries(genstar Rocon)
 target_link_libraries(wrl2hdf Rocon)
 #target_link_libraries(profane Rocon)
+SET_TARGET_PROPERTIES(Rocon PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(flotsam PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+SET_TARGET_PROPERTIES(wrl2hdf PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
 
 #ADD_TEST(RunAllTests ${EXECUTABLE_OUTPUT_PATH}/testx testresults.txt)
 #ADD_TEST(TestObject:ValidHandle ${TEST_RESULTS} TestObject:ValidHandle testresults.txt)
diff --git a/Rocprop/CMakeLists.txt b/Rocprop/CMakeLists.txt
index 2b016c00e4a..a2f7f8a6de8 100644
--- a/Rocprop/CMakeLists.txt
+++ b/Rocprop/CMakeLists.txt
@@ -7,22 +7,20 @@ IF(NOT ENABLE_MPI)
 ELSE()
   FIND_PACKAGE(MPI REQUIRED)
   add_definitions( -DMPICH_IGNORE_CXX_SEEK )
-#  IF(MPI_CXX_COMPILER)
-#    set (CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-#  ENDIF(MPI_CXX_COMPILER)
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
 ENDIF()
 
 #INCLUDE(CTest)
-find_path(ROCCOM_INC roccom.h HINTS ../Roccom/include) 
+find_path(ROCCOM_INC roccom.h HINTS ../Roccom/include)
 
 set (LIB_SRCS src/Propagation_3.C src/MarkerParticles_3.C src/FaceOffset_3.C src/Rocprop.C
-              src/NuLaplacian.C src/cons_diff.C src/AnisotropicSmoothing.C src/quadric_analysis.C 
+              src/NuLaplacian.C src/cons_diff.C src/AnisotropicSmoothing.C src/quadric_analysis.C
               src/detect_features.C)
-set (TEST_SRCS test/proptest.C test/mptest.C test/compare_normals.C test/rotate.C 
+set (TEST_SRCS test/proptest.C test/mptest.C test/compare_normals.C test/rotate.C
                test/advectest.C test/detectfeas.C test/PointPropagate.C)
 set (ALL_SRCS ${LIB_SRCS} ${TEST_SRCS})
 
-set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC" )
+set_source_files_properties(${ALL_SRCS} PROPERTIES COMPILE_FLAGS "-fPIC ${MPI_CXX_COMPILE_FLAGS}" )
 #set(TEST_SRCS src/MANTest.C)
 
 # rpath settings
@@ -38,7 +36,7 @@ ELSE()
   add_library(Rocprop STATIC ${LIB_SRCS})
   add_definitions( -DSTATIC_LINK )
 ENDIF()
-target_link_libraries(Rocprop Rocsurf Rocmap Rocblas Roccom)
+target_link_libraries(Rocprop Rocsurf Rocmap Rocblas Roccom ${MPI_CXX_LIBRARIES})
 
 add_executable(proptest test/proptest.C)
 add_executable(mptest test/mptest.C)
@@ -46,15 +44,19 @@ add_executable(compare_normals test/compare_normals.C)
 add_executable(rotate test/rotate.C)
 add_executable(advectest test/advectest.C test/PointPropagate.C)
 add_executable(detectfeas test/detectfeas.C)
-target_link_libraries(proptest Rocprop)
-target_link_libraries(mptest Rocprop)
-target_link_libraries(compare_normals Rocprop)
-target_link_libraries(rotate Rocprop)
-target_link_libraries(advectest Rocprop)
-target_link_libraries(detectfeas Rocprop)
-
-#ADD_TEST(RunAllTests ${EXECUTABLE_OUTPUT_PATH}/testx testresults.txt)
-#ADD_TEST(TestObject:ValidHandle ${TEST_RESULTS} TestObject:ValidHandle testresults.txt)
-#ADD_TEST(TestObject:Exists ${TEST_RESULTS} TestObject:Exists testresults.txt)
+target_link_libraries(proptest Rocprop ${MPI_CXX_LIBRARIES})
+target_link_libraries(mptest Rocprop ${MPI_CXX_LIBRARIES})
+target_link_libraries(compare_normals Rocprop ${MPI_CXX_LIBRARIES})
+target_link_libraries(rotate Rocprop ${MPI_CXX_LIBRARIES})
+target_link_libraries(advectest Rocprop ${MPI_CXX_LIBRARIES})
+target_link_libraries(detectfeas Rocprop ${MPI_CXX_LIBRARIES})
+
+set_target_properties(Rocprop PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+set_target_properties(proptest PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+set_target_properties(mptest PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+set_target_properties(compare_normals PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+set_target_properties(rotate PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+set_target_properties(advectest PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
+set_target_properties(detectfeas PROPERTIES LINK_FLAGS "${MPI_CXX_LINK_FLAGS}")
 
 INSTALL(TARGETS Rocprop RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
diff --git a/Rocprop/Makefile b/Rocprop/Makefile
deleted file mode 100644
index 437783fecf0..00000000000
--- a/Rocprop/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# Makefile for Rocprop
-
-srcdir          = .
-top_srcdir      = ..
-PREFIX		= $(top_srcdir)
-
-include $(srcdir)/Makefile.basic
diff --git a/Rocprop/Makefile.basic b/Rocprop/Makefile.basic
deleted file mode 100644
index 56cc6c10d2c..00000000000
--- a/Rocprop/Makefile.basic
+++ /dev/null
@@ -1,55 +0,0 @@
-# Makefile for Rocprop
-
-LIBDIR		= $(PREFIX)/lib
-BINDIR		= $(PREFIX)/bin
-
-LIBSUF		= so
-LIBRPROP	= $(LIBDIR)/libRocprop.$(LIBSUF)
-LIBDEPS		= -lRocsurf -lRocblas
-LIBS		= $(LIBRPROP)
-
-PROGRAMS	= proptest mptest compare_normals rotate advectest detectfeas \
-		  $(if $(SIMMETRIX_PROP), startest remesh) 
-OBJS		= Propagation_3.o MarkerParticles_3.o FaceOffset_3.o \
-		  Rocprop.o NuLaplacian.o cons_diff.o AnisotropicSmoothing.o \
-		  quadric_analysis.o detect_features.o \
-		  $(if $(SIMMETRIX_PROP),Remesher_Simmetrix.o)
-
-CHKOBJS		= $(OBJS) $(PROGRAMS:=.o)
-
-vpath	%.C	$(srcdir)/src $(srcdir)/test
-vpath	%.f	$(srcdir)/src
-vpath	%.a	$(LIBDIR)
-vpath 	%.so 	$(LIBDIR)
-
-COMHOME		= $(top_srcdir)/Roccom
-BUILD_COMHOME	= ../Roccom
-include		$(COMHOME)/Makefile.common
-CPPFLAGS	+= -I$(srcdir)/include $(if $(SIMMETRIX_PROP),-I$(SIMMHOME)/include) $(if $(MESH_ADAPT),-I$(srcdir)/../AdaptTriMesh/include -DMESH_ADAPT)
-
-#================== Actions =================
-all: $(LIBRPROP) $(PROGRAMS)
-
-$(LIBRPROP) : $(OBJS)
-$(LIBDIR)/libRocprop.so : SOLIBS := $(LIBDEPS) $(SOLIBS)
-
-ifeq "$(LIBSUF)" "a"
-LDLIBS	:= $(LIBDEPS) -lRocout -lRocin -lRocmap $(LDLIBS) \
-	$(if $(SIMMETRIX_PROP),-L$(SIMMLIBDIR) -lSimMeshing -lSimMeshTools \
-	-lSimModel -lSimDiscrete)
-else
-SOLIBS	+= $(if $(SIMMETRIX_PROP),-L$(SIMMLIBDIR) -lSimMeshing \
-	-lSimMeshTools -lSimModel -lSimDiscrete)
-endif
-
-LDLIBS += $(if $(MESH_ADAPT),-lATM $(OPENMESH_LIB))
-
-$(filter-out advectest,$(PROGRAMS)) : % :  %.o $(LIBRPROP)
-	$(LD) $(LDFLAGS) -o $@ $@.o -lRocprop -lRocblas $(LDLIBS)
-
-advectest : advectest.o PointPropagate.o $(LIBRPROP)
-	$(LD) $(LDFLAGS) -o $@ advectest.o PointPropagate.o -lRocprop -lRocsurf -lRocblas $(LDLIBS)
-
-# Clean up
-clean:
-	-$(RM) *.o *.u *.d *.hdf core
diff --git a/Rocprop/Makefile.in b/Rocprop/Makefile.in
deleted file mode 100644
index ffcbae8dca6..00000000000
--- a/Rocprop/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# Makefile for Rocprop
-# don't modify, used by configure
-
-srcdir          = @srcdir@
-top_srcdir      = @top_srcdir@
-PREFIX		= @prefix@
-
-include $(srcdir)/Makefile.basic
diff --git a/testing/share/Platforms/parallel_platforms b/testing/share/Platforms/parallel_platforms
index c8a4e374a78..ccd53a3fef4 100644
--- a/testing/share/Platforms/parallel_platforms
+++ b/testing/share/Platforms/parallel_platforms
@@ -13,4 +13,6 @@ ilrocstar5.illinois.rocstar irworkstation_parallel.list
 ilrocstar6 irworkstation_parallel.list
 ilrocstar6.illinois.rocstar irworkstation_parallel.list
 apollo irworkstation_parallel.list
+ilrocstar22 irworkstation_parallel.list
+ilrocstar22.illinois.rocstar irworkstation_parallel.list
 
diff --git a/testing/share/Platforms/platforms b/testing/share/Platforms/platforms
index f32e4c422c1..2b1fe237ca6 100644
--- a/testing/share/Platforms/platforms
+++ b/testing/share/Platforms/platforms
@@ -11,3 +11,5 @@ ilrocstar5.illinois.rocstar platform_tests_stub.list
 ilrocstar4 platform_tests_stub.list
 ilrocstar4.illinois.rocstar platform_tests_stub.list
 apollo platform_tests_stub.list
+ilrocstar22 platform_tests_stub.list
+ilrocstar22.illinois.rocstar platform_tests_stub.list