Skip to content

Commit

Permalink
tested MovingBoundary for linux and windows, updated linux libs
Browse files Browse the repository at this point in the history
  • Loading branch information
jcschaff committed Sep 13, 2017
1 parent 8406128 commit aade7db
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 13 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
/.DS_Store
/build-linux64/
/build-macos/
/packages/
12 changes: 12 additions & 0 deletions VagrantBoxes/linux64-test/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,15 @@ mkdir -p ${archiveDir}/FiniteVolume
cp ${workDir}/FiniteVolume/SimID_11538992_0_* ${archiveDir}/FiniteVolume
rm ${workDir}/FiniteVolume/*

#
# Test MovingBoundary_x64
#
mkdir -p ${workDir}/MovingBoundary
rm ${workDir}/MovingBoundary/*
cp ${inputDir}/MovingBoundary/SimID_599489767_0_* ${workDir}/MovingBoundary
${solverDir}/MovingBoundary_x64 --config ${workDir}/MovingBoundary/SimID_599489767_0_mb.xml

mkdir -p ${archiveDir}/MovingBoundary
cp ${workDir}/MovingBoundary/SimID_599489767_0_* ${archiveDir}/MovingBoundary
rm ${workDir}/MovingBoundary/*

32 changes: 20 additions & 12 deletions VagrantBoxes/linux64/moveDependentLibraries.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,16 @@ if [ ! -e "$builddir" ]; then
echo "skipping client build, directory $builddir missing"
else
cd $builddir
cp /usr/lib64/libhdf5_cpp.so.8 .
cp /usr/lib64/libhdf5.so.8 .
cp /usr/lib64/libactivemq-cpp.so.19 .
cp /usr/lib64/libgfortran.so.3 .
cp /usr/lib64/libquadmath.so.0 .
cp /usr/lib64/libapr-1.so.0 .
cp /lib64/libhdf5_cpp.so.8 .
cp /lib64/libhdf5.so.8 .
cp /lib64/libhdf5_hl_cpp.so.8 .
cp /lib64/libhdf5_hl.so.8 .
cp /lib64/libgfortran.so.3 .
cp /lib64/libquadmath.so.0 .
cp /lib64/libz.so.1 .
cp /lib64/libdl.so.2 .
cp /lib64/libactivemq-cpp.so.19 .
cp /lib64/libapr-1.so.0 .
fi


Expand All @@ -23,11 +27,15 @@ if [ ! -e "$builddir" ]; then
echo "skipping client build, directory $builddir missing"
else
cd $builddir
cp /usr/lib64/libhdf5_cpp.so.8 .
cp /usr/lib64/libhdf5.so.8 .
cp /usr/lib64/libactivemq-cpp.so.19 .
cp /usr/lib64/libgfortran.so.3 .
cp /usr/lib64/libquadmath.so.0 .
cp /usr/lib64/libapr-1.so.0 .
cp /lib64/libhdf5_cpp.so.8 .
cp /lib64/libhdf5.so.8 .
cp /lib64/libhdf5_hl_cpp.so.8 .
cp /lib64/libhdf5_hl.so.8 .
cp /lib64/libgfortran.so.3 .
cp /lib64/libquadmath.so.0 .
cp /lib64/libz.so.1 .
cp /lib64/libdl.so.2 .
cp /lib64/libactivemq-cpp.so.19 .
cp /lib64/libapr-1.so.0 .
fi

2 changes: 1 addition & 1 deletion VagrantBoxes/macos-test/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

shopt -s -o nounset

echo "testing solvers using binaries and libraries in build-linux64/bin and tests in testFiles"
echo "testing solvers using binaries and libraries in build-macos/bin and tests in testFiles"

projectDir=/vagrant_numerics

Expand Down
24 changes: 24 additions & 0 deletions VagrantBoxes/win64-test/test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,27 @@ $CMD_DEL_WORK_FILES = "del " + $TEST_WORK_FINITEVOLUME_DIR + '\*'
Invoke-Expression $CMD_COPY_ALL_FILES
Invoke-Expression $CMD_DEL_WORK_FILES

#
# Test $PROJECTDIR\build-win64\bin\MovingBoundary_x64.exe
#
$TEST_WORK_MOVINGBOUNDARY_DIR = $TEST_WORK_DIR + "\MovingBoundary"
if(!(Test-Path $TEST_WORK_MOVINGBOUNDARY_DIR)){
mkdir $TEST_WORK_MOVINGBOUNDARY_DIR
}
$CMD_DEL_WORK_FILES = "del " + $TEST_WORK_MOVINGBOUNDARY_DIR + '\*'
$CMD_COPY_INPUT_FILES = "copy " + $TEST_INPUT_DIR + '\MovingBoundary\SimID_599489767_0_* ' + $TEST_WORK_DIR + '\MovingBoundary'
$CMD_SOLVE = $SOLVERDIR + '\MovingBoundary_x64 --config ' + $TEST_WORK_DIR + '\MovingBoundary\SimID_599489767_0_mb.xml'
Invoke-Expression $CMD_DEL_WORK_FILES
Invoke-Expression $CMD_COPY_INPUT_FILES
Invoke-Expression $CMD_SOLVE

$TEST_ARCHIVE_WIN64_MOVINGBOUNDARY_DIR = $TEST_ARCHIVE_WIN64_DIR + '\MovingBoundary'
if(!(Test-Path $TEST_ARCHIVE_WIN64_MOVINGBOUNDARY_DIR)){
mkdir $TEST_ARCHIVE_WIN64_MOVINGBOUNDARY_DIR
}

$CMD_COPY_ALL_FILES = "copy " + $TEST_WORK_DIR + '\MovingBoundary\SimID_599489767_0_* ' + $TEST_ARCHIVE_WIN64_DIR + '\MovingBoundary'
$CMD_DEL_WORK_FILES = "del " + $TEST_WORK_MOVINGBOUNDARY_DIR + '\*'
Invoke-Expression $CMD_COPY_ALL_FILES
Invoke-Expression $CMD_DEL_WORK_FILES

0 comments on commit aade7db

Please sign in to comment.