Merge pull request #13702 from gforney/master

add hypre/sundials version info to fds status output

Author: gforney

Build/Scripts/HYPRE/build_hypre.bat

@@ -5,15 +5,14 @@ set LIB_TAG=v2.32.0
 
 set LIB_DIR=%LIB_TAG%
 
-
 ::*** parse options
 
 set clean_hypre=
 
 call :getopts %*
 if %stopscript% == 1 exit /b
 
-::*** make sure cmake and gcc are installed
+::*** make sure cmake and make are installed
 
 set abort=0
 set buildstatus=
@@ -219,21 +218,6 @@ exit /b
   )
   exit /b 0
 
-:: -------------------------------------------------------------
-:have_program
-:: -------------------------------------------------------------
-:: same as is_file_installed except does not abort script if program is not insstalled
-
-  set program=%1
-  where %program% 1> installed_error.txt 2>&1
-  type installed_error.txt | find /i /c "Could not find" > installed_error_count.txt
-  set /p nothave=<installed_error_count.txt
-  erase installed_error_count.txt installed_error.txt
-  if %nothave% == 1 (
-    exit /b 1
-  )
-  exit /b 0
-
 :: -------------------------------------------------------------
 :usage  
 :: -------------------------------------------------------------

Build/Scripts/SUNDIALS/build_sundials.bat

@@ -11,7 +11,7 @@ set clean_sundials=
 call :getopts %*
 if %stopscript% == 1 exit /b
 
-::*** make sure cmake and gcc are installed
+::*** make sure cmake and make are installed
 
 set abort=0
 set buildstatus=
@@ -220,21 +220,6 @@ exit /b
   )
   exit /b 0
 
-:: -------------------------------------------------------------
-:have_program
-:: -------------------------------------------------------------
-:: same as is_file_installed except does not abort script if program is not insstalled
-
-  set program=%1
-  where %program% 1> installed_error.txt 2>&1
-  type installed_error.txt | find /i /c "Could not find" > installed_error_count.txt
-  set /p nothave=<installed_error_count.txt
-  erase installed_error_count.txt installed_error.txt
-  if %nothave% == 1 (
-    exit /b 1
-  )
-  exit /b 0
-
 :: -------------------------------------------------------------
 :usage  
 :: -------------------------------------------------------------

Build/makefile

@@ -18,6 +18,10 @@ ifdef INTEL_IFORT
    I_IFORT=$(INTEL_IFORT)
 endif
 
+# 3rd part library versions 
+HYPRE_VERSION=v2.32.0
+SUNDIALS_VERSION=v6.7.0
+
 ifeq ($(shell echo "check_quotes"),"check_quotes")
 # windows
   GIT_HASH := $(shell ..\Scripts\githash)
@@ -44,6 +48,9 @@ else
   CLT_VERSION := $(shell ../Scripts/osx_clt.sh)
 endif
 
+HYPRE_INFO=-DHYPRE_PP=\"$(HYPRE_VERSION)\"
+SUNDIALS_INFO=-DSUNDIALS_PP=\"$(SUNDIALS_VERSION)\"
+
 GITINFO_BASE=-DGITHASH_PP=\"$(GIT_HASH)$(GIT_STAT)-$(GIT_BRANCH)\" -DGITDATE_PP=\""$(GIT_DATE)\""
 GITINFO=-fpp $(GITINFO_BASE) -DBUILDDATE_PP=\""$(BUILD_DATE)\""
 GITINFOGNU=-cpp $(GITINFO_BASE) -DBUILDDATE_PP=\""$(BUILD_DATE)\""
@@ -107,15 +114,15 @@ endif # MKLROOT test
 
 
 ifdef SUNDIALS_HOME # This assumes the SUNDIALS library is available.
-   FFLAGS_SUNDIALS = -DWITH_SUNDIALS -I"${SUNDIALS_HOME}/fortran"
-   FFLAGS_SUNDIALS_WIN = -DWITH_SUNDIALS /I"${SUNDIALS_HOME}\fortran"
+   FFLAGS_SUNDIALS = -DWITH_SUNDIALS ${SUNDIALS_INFO} -I"${SUNDIALS_HOME}/fortran"
+   FFLAGS_SUNDIALS_WIN = -DWITH_SUNDIALS ${SUNDIALS_INFO} /I"${SUNDIALS_HOME}\fortran"
    LFLAGS_SUNDIALS = ${SUNDIALS_HOME}/lib/libsundials_fcvode_mod.a ${SUNDIALS_HOME}/lib/libsundials_fnvecserial_mod.a ${SUNDIALS_HOME}/lib/libsundials_cvode.a
    LFLAGS_SUNDIALS_WIN = ${SUNDIALS_HOME}\lib\sundials_fcvode_mod.lib ${SUNDIALS_HOME}\lib\sundials_fnvecserial_mod.lib ${SUNDIALS_HOME}\lib\sundials_cvode.lib  /link /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:libcmtd.lib
 endif
 
 ifdef HYPRE_HOME # This assumes the HYPRE library is available.
-   FFLAGS_HYPRE = -DWITH_HYPRE -I${HYPRE_HOME}/include
-   FFLAGS_HYPRE_WIN = -DWITH_HYPRE /I"${HYPRE_HOME}\include"
+   FFLAGS_HYPRE = -DWITH_HYPRE ${HYPRE_INFO} -I${HYPRE_HOME}/include
+   FFLAGS_HYPRE_WIN = -DWITH_HYPRE ${HYPRE_INFO} /I"${HYPRE_HOME}\include"
    LFLAGS_HYPRE = -L${HYPRE_HOME}/lib -lHYPRE -lm
    LFLAGS_HYPRE_WIN = ${HYPRE_HOME}\lib\HYPRE.lib
 endif

Source/func.f90

@@ -5915,6 +5915,16 @@ SUBROUTINE WRITE_SUMMARY_INFO(LU,INPUT_FILE_INCLUDED)
 CALL MPI_GET_VERSION(MPIVERSION,MPISUBVERSION,IERR)
 WRITE(LU,'(/A,I1,A,I1)') ' MPI version: ',MPIVERSION,'.',MPISUBVERSION
 WRITE(LU,'(A,A)') ' MPI library version: ',TRIM(MPILIBVERSION)
+#ifdef HYPRE_PP
+WRITE(LU,'(A,A)') ' Hypre library version: ',TRIM(HYPRE_PP)
+#else
+WRITE(LU,'(A)') ' Hypre library: not used '
+#endif
+#ifdef SUNDIALS_PP
+WRITE(LU,'(A,A)') ' Sundials library version: ',TRIM(SUNDIALS_PP)
+#else
+WRITE(LU,'(A)') ' Sundials library: not used'
+#endif
 
 END SUBROUTINE WRITE_SUMMARY_INFO