Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change action from simbody debian package to source #33

Merged
merged 17 commits into from
Jun 28, 2021
28 changes: 20 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ jobs:
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
Expand All @@ -30,15 +29,28 @@ jobs:
sudo apt-get install -y apt-utils \
build-essential \
cmake \
googletest \
libtbb-dev \
libboost-all-dev \
libsimbody-dev \
libsimbody3.6
liblapack-dev \
wget
wget https://github.com/simbody/simbody/archive/Simbody-3.7.tar.gz
tar xvzf Simbody-3.7.tar.gz
rm Simbody-3.7.tar.gz
mkdir ./simbody-build
mkdir /home/runner/simbody
export simbody_install_path=$(pwd)/simdody
cd ./simbody-build
cmake ../simbody-Simbody-3.7 -DCMAKE_INSTALL_PREFIX=/home/runner/simbody -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_VISUALIZER=off -DBUILD_STATIC_LIBRARIES=on
make -j$(nproc)
# && ctest -j$(nproc)
make -j$(nproc) install
cd ..
export TBB_HOME=/usr/lib/x86_64-linux-gnu
export BOOST_HOME=/usr/lib/x86_64-linux-gnu
export SIMBODY_HOME=/usr
mkdir build
export SIMBODY_HOME=/home/runner/simbody
mkdir build
cd build
cmake ..
make -j$(nproc)
ctest -E "test_2d_owsc" --output-on-failure
cmake ..
make -j$(nproc)
ctest --output-on-failure
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,8 @@ StructuralSimulation::StructuralSimulation(StructuralSimulationInput* input):
resolution_list_(input->resolution_list_),
material_model_list_(input->material_model_list_),
physical_viscosity_(input->physical_viscosity_),
particle_relaxation_(input->particle_relaxation_), // particle relaxation
system_(SPHSystem(BoundingBox(Vec3d(0), Vec3d(0)), default_resolution_)),
in_output_(In_Output(system_)),
contacting_bodies_list_(input->contacting_bodies_list_),

particle_relaxation_(input->particle_relaxation_), // particle relaxation
system_(SPHSystem(BoundingBox(Vec3d(0), Vec3d(0)), default_resolution_)),
in_output_(In_Output(system_)),

Expand Down
6 changes: 6 additions & 0 deletions SPHINXsys/src/shared/simbody_sphinxsys/simbody_middle.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,18 @@

#ifndef SIMBODY_MIDDLE_H
#define SIMBODY_MIDDLE_H

#ifdef __linux__
#pragma GCC system_header //for GCC/CLANG
#elif _WIN32
#pragma warning(push, 0) //for MSVC
#endif

#include "SimTKcommon.h"
#include "SimTKmath.h"
#include "Simbody.h"

#ifdef _WIN32
#pragma warning(pop) //for MSVC
#endif
#endif //SIMBODY_MIDDLE_H