Skip to content

Commit

Permalink
moves scotch and libjpeg sources to external_libs/ folder (similar to…
Browse files Browse the repository at this point in the history
… 3D version)
  • Loading branch information
danielpeter committed Feb 9, 2019
1 parent 2420819 commit 3a12a85
Show file tree
Hide file tree
Showing 727 changed files with 184 additions and 83 deletions.
86 changes: 43 additions & 43 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,49 +11,49 @@ setup/constants.h
setup/precision.h

# Scotch files
src/meshfem2D/scotch_5.1.12b/src/Makefile.inc
src/meshfem2D/scotch_5.1.12b/bin/
src/meshfem2D/scotch_5.1.12b/include/
src/meshfem2D/scotch_5.1.12b/lib/
src/meshfem2D/scotch_5.1.12b/src/libscotch/*.o
src/meshfem2D/scotch_5.1.12b/src/libscotch/*.a
src/meshfem2D/scotch_5.1.12b/src/libscotch/dummysizes
src/meshfem2D/scotch_5.1.12b/src/libscotch/parser_ll.c
src/meshfem2D/scotch_5.1.12b/src/libscotch/parser_ly.h
src/meshfem2D/scotch_5.1.12b/src/libscotch/parser_yy.c
src/meshfem2D/scotch_5.1.12b/src/libscotch/scotch.h
src/meshfem2D/scotch_5.1.12b/src/libscotch/scotchf.h
src/meshfem2D/scotch_5.1.12b/src/libscotch/y.output
src/meshfem2D/scotch_5.1.12b/src/libscotchmetis/*.o
src/meshfem2D/scotch_5.1.12b/src/libscotchmetis/libscotchmetis.a
src/meshfem2D/scotch_5.1.12b/src/scotch/acpl
src/meshfem2D/scotch_5.1.12b/src/scotch/amk_ccc
src/meshfem2D/scotch_5.1.12b/src/scotch/amk_fft2
src/meshfem2D/scotch_5.1.12b/src/scotch/amk_grf
src/meshfem2D/scotch_5.1.12b/src/scotch/amk_hy
src/meshfem2D/scotch_5.1.12b/src/scotch/amk_m2
src/meshfem2D/scotch_5.1.12b/src/scotch/amk_p2
src/meshfem2D/scotch_5.1.12b/src/scotch/atst
src/meshfem2D/scotch_5.1.12b/src/scotch/gbase
src/meshfem2D/scotch_5.1.12b/src/scotch/gcv
src/meshfem2D/scotch_5.1.12b/src/scotch/gmap
src/meshfem2D/scotch_5.1.12b/src/scotch/gmk_hy
src/meshfem2D/scotch_5.1.12b/src/scotch/gmk_m2
src/meshfem2D/scotch_5.1.12b/src/scotch/gmk_m3
src/meshfem2D/scotch_5.1.12b/src/scotch/gmk_msh
src/meshfem2D/scotch_5.1.12b/src/scotch/gmk_ub2
src/meshfem2D/scotch_5.1.12b/src/scotch/gmtst
src/meshfem2D/scotch_5.1.12b/src/scotch/gord
src/meshfem2D/scotch_5.1.12b/src/scotch/gotst
src/meshfem2D/scotch_5.1.12b/src/scotch/gout
src/meshfem2D/scotch_5.1.12b/src/scotch/gpart
src/meshfem2D/scotch_5.1.12b/src/scotch/gscat
src/meshfem2D/scotch_5.1.12b/src/scotch/gtst
src/meshfem2D/scotch_5.1.12b/src/scotch/mcv
src/meshfem2D/scotch_5.1.12b/src/scotch/mmk_m2
src/meshfem2D/scotch_5.1.12b/src/scotch/mmk_m3
src/meshfem2D/scotch_5.1.12b/src/scotch/mord
src/meshfem2D/scotch_5.1.12b/src/scotch/mtst
external_libs/scotch_5.1.12b/src/Makefile.inc
external_libs/scotch_5.1.12b/bin/
external_libs/scotch_5.1.12b/include/
external_libs/scotch_5.1.12b/lib/
external_libs/scotch_5.1.12b/src/libscotch/*.o
external_libs/scotch_5.1.12b/src/libscotch/*.a
external_libs/scotch_5.1.12b/src/libscotch/dummysizes
external_libs/scotch_5.1.12b/src/libscotch/parser_ll.c
external_libs/scotch_5.1.12b/src/libscotch/parser_ly.h
external_libs/scotch_5.1.12b/src/libscotch/parser_yy.c
external_libs/scotch_5.1.12b/src/libscotch/scotch.h
external_libs/scotch_5.1.12b/src/libscotch/scotchf.h
external_libs/scotch_5.1.12b/src/libscotch/y.output
external_libs/scotch_5.1.12b/src/libscotchmetis/*.o
external_libs/scotch_5.1.12b/src/libscotchmetis/libscotchmetis.a
external_libs/scotch_5.1.12b/src/scotch/acpl
external_libs/scotch_5.1.12b/src/scotch/amk_ccc
external_libs/scotch_5.1.12b/src/scotch/amk_fft2
external_libs/scotch_5.1.12b/src/scotch/amk_grf
external_libs/scotch_5.1.12b/src/scotch/amk_hy
external_libs/scotch_5.1.12b/src/scotch/amk_m2
external_libs/scotch_5.1.12b/src/scotch/amk_p2
external_libs/scotch_5.1.12b/src/scotch/atst
external_libs/scotch_5.1.12b/src/scotch/gbase
external_libs/scotch_5.1.12b/src/scotch/gcv
external_libs/scotch_5.1.12b/src/scotch/gmap
external_libs/scotch_5.1.12b/src/scotch/gmk_hy
external_libs/scotch_5.1.12b/src/scotch/gmk_m2
external_libs/scotch_5.1.12b/src/scotch/gmk_m3
external_libs/scotch_5.1.12b/src/scotch/gmk_msh
external_libs/scotch_5.1.12b/src/scotch/gmk_ub2
external_libs/scotch_5.1.12b/src/scotch/gmtst
external_libs/scotch_5.1.12b/src/scotch/gord
external_libs/scotch_5.1.12b/src/scotch/gotst
external_libs/scotch_5.1.12b/src/scotch/gout
external_libs/scotch_5.1.12b/src/scotch/gpart
external_libs/scotch_5.1.12b/src/scotch/gscat
external_libs/scotch_5.1.12b/src/scotch/gtst
external_libs/scotch_5.1.12b/src/scotch/mcv
external_libs/scotch_5.1.12b/src/scotch/mmk_m2
external_libs/scotch_5.1.12b/src/scotch/mmk_m3
external_libs/scotch_5.1.12b/src/scotch/mord
external_libs/scotch_5.1.12b/src/scotch/mtst

# Build time
bin/*
Expand Down
95 changes: 85 additions & 10 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -6588,7 +6588,7 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
# uses bundled scotch: current version pointed to by symbolic link scotch/
USE_BUNDLED_SCOTCH=1

SCOTCH_DIR="$srcdir/src/meshfem2D/scotch"
SCOTCH_DIR="$srcdir/external_libs/scotch"
SCOTCH_LIBDIR="${SCOTCH_DIR}/lib"
SCOTCH_INCLUDEDIR="${SCOTCH_DIR}/include"
else
Expand Down Expand Up @@ -6646,21 +6646,21 @@ if test x"$MPIFC" = x; then :
MPIFC=mpif90

fi

if test x"$MPICC" = x; then :

MPICC=mpicc

fi

if test x"$LOCAL_PATH_IS_ALSO_GLOBAL" = x; then :

LOCAL_PATH_IS_ALSO_GLOBAL=true

fi

# Checks for typedefs, structures, and compiler characteristics.

# check fortran modules flag

$as_echo "## ----------------- ##
## module extensions ##
## ----------------- ##"
Expand Down Expand Up @@ -7620,16 +7620,80 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu

fi

############################################################
##
## Git version info
##
$as_echo "## ---------------- ##
## git version info ##
## ---------------- ##"

$as_echo "## ----------------------------------- ##
## setting up default simulation setup ##
## ----------------------------------- ##"
pushd $srcdir > /dev/null
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for .git/config" >&5
$as_echo_n "checking for .git/config... " >&6; }
if ${ac_cv_file__git_config+:} false; then :
$as_echo_n "(cached) " >&6
else
test "$cross_compiling" = yes &&
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
if test -r ".git/config"; then
ac_cv_file__git_config=yes
else
ac_cv_file__git_config=no
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__git_config" >&5
$as_echo "$ac_cv_file__git_config" >&6; }
if test "x$ac_cv_file__git_config" = xyes; then :

# Output results.
ac_config_files="$ac_config_files Makefile setup/constants.h setup/constants_tomography.h setup/precision.h setup/config.fh"
SPECFEM2D_RELEASE_VERSION=0
eval SPECFEM2D_GIT_REVISION=`git describe`
eval SPECFEM2D_GIT_HASH=`git log -1 --pretty=format:%H`
eval SPECFEM2D_GIT_DATE=\"`git log -1 --pretty=format:%ci`\"
eval SPECFEM2D_GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`

else

SPECFEM2D_RELEASE_VERSION=1
SPECFEM2D_GIT_REVISION="unknown"
SPECFEM2D_GIT_HASH="unknown"
SPECFEM2D_GIT_DATE="unknown"
SPECFEM2D_GIT_BRANCH="unknown"

fi

popd > /dev/null

cat >>confdefs.h <<_ACEOF
#define SPECFEM2D_RELEASE_VERSION $SPECFEM2D_RELEASE_VERSION
_ACEOF


cat >>confdefs.h <<_ACEOF
#define SPECFEM2D_GIT_REVISION "$SPECFEM2D_GIT_REVISION"
_ACEOF


cat >>confdefs.h <<_ACEOF
#define SPECFEM2D_GIT_HASH "$SPECFEM2D_GIT_HASH"
_ACEOF


cat >>confdefs.h <<_ACEOF
#define SPECFEM2D_GIT_DATE "$SPECFEM2D_GIT_DATE"
_ACEOF


cat >>confdefs.h <<_ACEOF
#define SPECFEM2D_GIT_BRANCH "$SPECFEM2D_GIT_BRANCH"
_ACEOF



cat >>confdefs.h <<_ACEOF
#define SPECFEM2D_VERSION "$PACKAGE_VERSION"
_ACEOF

#AC_DEFINE_UNQUOTED([SPECFEM2D_DOI], ["10.5281/zenodo.xxxxx"], [Define SPECFEM2D doi])
if test -d $srcdir/.git; then :

GIT_VERSION_DEPS="$srcdir/.git/logs/HEAD"
Expand All @@ -7646,6 +7710,17 @@ $as_echo "$as_me: not a git repository" >&6;}

fi

############################################################

$as_echo "## ----------------------------------- ##
## setting up default simulation setup ##
## ----------------------------------- ##"

# Output results.
ac_config_files="$ac_config_files Makefile setup/constants.h setup/constants_tomography.h setup/precision.h setup/config.fh"


# Scotch makefile
if test "$USE_BUNDLED_SCOTCH" = 1; then
ac_config_files="$ac_config_files ${SCOTCH_DIR}/src/Makefile.inc"

Expand Down Expand Up @@ -8403,12 +8478,12 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"setup/config.h") CONFIG_HEADERS="$CONFIG_HEADERS setup/config.h" ;;
"setup/version.fh") CONFIG_FILES="$CONFIG_FILES setup/version.fh" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"setup/constants.h") CONFIG_FILES="$CONFIG_FILES setup/constants.h" ;;
"setup/constants_tomography.h") CONFIG_FILES="$CONFIG_FILES setup/constants_tomography.h" ;;
"setup/precision.h") CONFIG_FILES="$CONFIG_FILES setup/precision.h" ;;
"setup/config.fh") CONFIG_FILES="$CONFIG_FILES setup/config.fh" ;;
"setup/version.fh") CONFIG_FILES="$CONFIG_FILES setup/version.fh" ;;
"${SCOTCH_DIR}/src/Makefile.inc") CONFIG_FILES="$CONFIG_FILES ${SCOTCH_DIR}/src/Makefile.inc" ;;
"DATA/Par_file") CONFIG_FILES="$CONFIG_FILES DATA/Par_file:DATA/Par_file" ;;
"DATA/SOURCE") CONFIG_FILES="$CONFIG_FILES DATA/SOURCE:DATA/SOURCE" ;;
Expand Down
34 changes: 21 additions & 13 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ else
# uses bundled scotch: current version pointed to by symbolic link scotch/
USE_BUNDLED_SCOTCH=1

SCOTCH_DIR="$srcdir/src/meshfem2D/scotch"
SCOTCH_DIR="$srcdir/external_libs/scotch"
SCOTCH_LIBDIR="${SCOTCH_DIR}/lib"
SCOTCH_INCLUDEDIR="${SCOTCH_DIR}/include"
else
Expand Down Expand Up @@ -283,17 +283,17 @@ AC_ARG_VAR(LOCAL_PATH_IS_ALSO_GLOBAL, [files on a local path on each node are al
AS_IF([test x"$MPIFC" = x],[
MPIFC=mpif90
])

AS_IF([test x"$MPICC" = x],[
MPICC=mpicc
])

AS_IF([test x"$LOCAL_PATH_IS_ALSO_GLOBAL" = x],[
LOCAL_PATH_IS_ALSO_GLOBAL=true
])

# Checks for typedefs, structures, and compiler characteristics.

# check fortran modules flag

AS_BOX([module extensions])

AC_FC_MODULE_EXTENSION
Expand Down Expand Up @@ -329,6 +329,23 @@ AS_IF([test x"$want_cuda" != xno], [
CIT_CUDA_CONFIG
])

##
## Git version info
##
AS_BOX([git version info])
CIG_PKG_GIT(SPECFEM2D)
AC_DEFINE_UNQUOTED([SPECFEM2D_VERSION], ["$PACKAGE_VERSION"], [Define SPECFEM2D version])
#AC_DEFINE_UNQUOTED([SPECFEM2D_DOI], ["10.5281/zenodo.xxxxx"], [Define SPECFEM2D doi])
AS_IF([test -d $srcdir/.git], [
GIT_VERSION_DEPS="$srcdir/.git/logs/HEAD"
AC_MSG_NOTICE([building from git repository])
AC_SUBST(GIT_VERSION_DEPS)
], [
dnl Only substitute if not in a git repository.
AC_MSG_NOTICE([not a git repository])
AC_CONFIG_FILES([setup/version.fh])
])

############################################################

AS_BOX([setting up default simulation setup])
Expand All @@ -342,16 +359,7 @@ AC_CONFIG_FILES([
setup/config.fh
])

AS_IF([test -d $srcdir/.git], [
GIT_VERSION_DEPS="$srcdir/.git/logs/HEAD"
AC_MSG_NOTICE([building from git repository])
AC_SUBST(GIT_VERSION_DEPS)
], [
dnl Only substitute if not in a git repository.
AC_MSG_NOTICE([not a git repository])
AC_CONFIG_FILES([setup/version.fh])
])

# Scotch makefile
if test "$USE_BUNDLED_SCOTCH" = 1; then
AC_CONFIG_FILES([
${SCOTCH_DIR}/src/Makefile.inc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ RECURSIVE = YES
# Note that relative paths are relative to the directory from which doxygen is
# run.

EXCLUDE = "../../src/meshfem2D/scotch" "../../src/meshfem2D/scotch_5.1.12b"
EXCLUDE = "../../external_libs/scotch" "../../external_libs/scotch_5.1.12b"

# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ RECURSIVE = YES
# Note that relative paths are relative to the directory from which doxygen is
# run.

EXCLUDE = "../../src/meshfem2D/scotch" "../../src/meshfem2D/scotch_5.1.12b"
EXCLUDE = "../../external_libs/scotch" "../../external_libs/scotch_5.1.12b"

# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 3a12a85

Please sign in to comment.