Update "models/parflow_pdaf" to v3.14.1-pdaf (#123)

- Updating `parflow_pdaf` to current Parflow master
- HPSCTerrSys/parflow#9
- HPSCTerrSys/parflow#10
- HPSCTerrSys/parflow#11
- BuildPDAFModel: Add `-lstdc++`
- at least for now: don't use UMPIRE and SUNDIALS

Author: jjokella

.gitmodules

@@ -9,7 +9,7 @@
 [submodule "models/parflow_pdaf"]
 	path = models/parflow_pdaf
 	url = https://github.com/HPSCTerrSys/parflow
-	branch = tsmp-pdaf-patched-openmp-flag-fix
+	branch = v3.14.1-pdaf
 [submodule "models/pdaf"]
 	path = models/pdaf
 	url = https://github.com/HPSCTerrSys/pdaf.git

cmake/BuildPDAFMODEL.cmake

@@ -100,7 +100,7 @@ if(DEFINED PARFLOW_SRC)
   # GPU
   # list(APPEND PDAF_LIBS "-L${CMAKE_INSTALL_PREFIX}/rmm/lib -lstdc++ -lcudart -lrmm -lnvToolsExt")
   list(APPEND PDAF_LIBS "-L${HYPRE_ROOT}/lib -lHYPRE")
-  list(APPEND PDAF_LIBS "-L/lib64 -lslurm")
+  list(APPEND PDAF_LIBS "-L/lib64 -lslurm -lstdc++")
 endif()
 
 # Join list of libraries

cmake/BuildParFlow.cmake

@@ -61,12 +61,12 @@ else()
 endif()
 
 # Enable Umpire if exists
-if (DEFINED ENV{UMPIRE_ROOT})
+if (DEFINED ENV{UMPIRE_ROOT} AND NOT ${PDAF})
   set(PF_UMPIRE_FLAG "-DUMPIRE_ROOT=$ENV{UMPIRE_ROOT}")
 endif()
 
 # Enable SUNDIALS if exists
-if (DEFINED ENV{SUNDIALS_ROOT})
+if (DEFINED ENV{SUNDIALS_ROOT} AND NOT ${PDAF})
     set(PF_SUNDIALS_FLAG "-DSUNDIALS_ROOT=$ENV{SUNDIALS_ROOT}")
 endif()