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.

Sign up for GitHub

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

Jump to bottom

Core Add boost #10145

Closed
wants to merge 4 commits into from
Closed

Core Add boost #10145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d669c5d
Removing old references to boost_shared_ptr
roigcarlo Aug 10, 2022
3814f92
More incorrect includes
roigcarlo Aug 10, 2022
9281840
Adding boost for core
roigcarlo Aug 17, 2022
182c6c9
Removing boost dowload from the CI
roigcarlo Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
21 changes: 7 additions & 14 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,13 +312,6 @@ jobs:
with:
python-version: '3.8'

- name: Download boost
run: |
$url = "https://boostorg.jfrog.io/artifactory/main/release/1.74.0/source/boost_1_74_0.tar.gz"
(New-Object System.Net.WebClient).DownloadFile($url, "$env:TEMP\boost.tar.gz")
7z.exe x "$env:TEMP\boost.tar.gz" -o"$env:TEMP\boostArchive" -y | Out-Null
7z.exe x "$env:TEMP\boostArchive" -o"$env:TEMP\boost" -y | Out-Null

- name: Installing dependencies
shell: cmd
run: |
Expand All @@ -343,13 +336,13 @@ jobs:
del /F /Q "%KRATOS_BUILD%\%KRATOS_BUILD_TYPE%\CMakeCache.txt"
del /F /Q "%KRATOS_BUILD%\%KRATOS_BUILD_TYPE%\CMakeFiles"

cmake ^
-G"Visual Studio 17 2022" ^
-H"%KRATOS_SOURCE%" ^
-B"%KRATOS_BUILD%\%KRATOS_BUILD_TYPE%" ^
-DBOOST_ROOT="%TEMP%\boost" ^
-DINSTALL_RUNKRATOS=OFF ^
-DCMAKE_CXX_FLAGS="/Od /we4661 /we4804 /WX /wd4996" ^
cmake ^
-G"Visual Studio 17 2022" ^
-H"%KRATOS_SOURCE%" ^
-B"%KRATOS_BUILD%\%KRATOS_BUILD_TYPE%" ^
-DBOOST_ROOT="%KRATOS_SOURCE%\external_libraries\boost" ^
-DINSTALL_RUNKRATOS=OFF ^
-DCMAKE_CXX_FLAGS="/Od /we4661 /we4804 /WX /wd4996" ^
-DFORCE_LOCAL_ZLIB_COMPILATION=ON || goto :error

cmake --build "%KRATOS_BUILD%\%KRATOS_BUILD_TYPE%" --target all_build -- /property:configuration=%KRATOS_BUILD_TYPE% /p:Platform=x64 || goto :error
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/configure.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ del /F /Q "%KRATOS_BUILD%\%KRATOS_BUILD_TYPE%\cmake_install.cmake"
del /F /Q "%KRATOS_BUILD%\%KRATOS_BUILD_TYPE%\CMakeCache.txt"
del /F /Q "%KRATOS_BUILD%\%KRATOS_BUILD_TYPE%\CMakeFiles"

cmake ^
-G"Visual Studio 17 2022" ^
-H"%KRATOS_SOURCE%" ^
-B"%KRATOS_BUILD%\%KRATOS_BUILD_TYPE%" ^
-DBOOST_ROOT="%TEMP%\boost" ^
-DINSTALL_RUNKRATOS=OFF ^
-DCMAKE_CXX_FLAGS="/Od /we4661 /we4804 /WX /wd4996" ^
-DFORCE_LOCAL_ZLIB_COMPILATION=ON ^
cmake ^
-G"Visual Studio 17 2022" ^
-H"%KRATOS_SOURCE%" ^
-B"%KRATOS_BUILD%\%KRATOS_BUILD_TYPE%" ^
-DBOOST_ROOT="%KRATOS_SOURCE%\external_libraries\boost" ^
-DINSTALL_RUNKRATOS=OFF ^
-DCMAKE_CXX_FLAGS="/Od /we4661 /we4804 /WX /wd4996" ^
-DFORCE_LOCAL_ZLIB_COMPILATION=ON ^
-DCMAKE_UNITY_BUILD=ON || goto :error

cmake --build "%KRATOS_BUILD%\%KRATOS_BUILD_TYPE%" --target all_build -- /property:configuration=%KRATOS_BUILD_TYPE% /p:Platform=x64 || goto :error
Expand Down
1 change: 0 additions & 1 deletion ...cations/ConstitutiveModelsApplication/custom_python/python_outfitted_constitutive_law.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

// External includes
#include <cmath>
#include <boost/python.h>

// Project includes
#include "includes/constitutive_law.h"
Expand Down
2 changes: 0 additions & 2 deletions applications/ConstitutiveModelsApplication/custom_utilities/stress_invariants_utilities.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
#include <cmath>
#include <set>


// External includes
#include "boost/smart_ptr.hpp"

// Project includes
#include "includes/define.h"
Expand Down
2 changes: 0 additions & 2 deletions ...echanicsApplication/custom_conditions/beam_contact/beam_point_rigid_contact_condition.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@
#define KRATOS_BEAM_POINT_RIGID_CONTACT_CONDITION_H_INCLUDED



// System includes

// External includes
#include "boost/smart_ptr.hpp"

// Project includes
#include "includes/define.h"
Expand Down
1 change: 0 additions & 1 deletion ...actMechanicsApplication/custom_conditions/rigid_contact/point_rigid_contact_condition.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
// System includes

// External includes
#include "boost/smart_ptr.hpp"

// Project includes
#include "includes/define.h"
Expand Down
2 changes: 0 additions & 2 deletions ...chanicsApplication/custom_conditions/thermal_contact/thermal_contact_domain_condition.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
#include <iomanip>

// External includes
#include "boost/smart_ptr.hpp"


// Project includes
#include "includes/define.h"
Expand Down
1 change: 0 additions & 1 deletion ...lication/custom_strategies/schemes/residual_based_bossak_displacement_rotation_scheme.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
/* System includes */

/* External includes */
#include "boost/smart_ptr.hpp"

/* Project includes */
#include "includes/define.h"
Expand Down
1 change: 0 additions & 1 deletion applications/ContactMechanicsApplication/custom_utilities/rigid_body_utilities.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#endif

// External includes
#include "boost/smart_ptr.hpp"
#include "utilities/timer.h"

// Project includes
Expand Down
1 change: 0 additions & 1 deletion applications/ContactMechanicsApplication/custom_utilities/spline_curve_utilities.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#endif

// External includes
#include "boost/smart_ptr.hpp"
#include "utilities/timer.h"

// Project includes
Expand Down
4 changes: 0 additions & 4 deletions applications/FSIApplication/custom_utilities/shared_points_mapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,10 @@
#define KRATOS_SHARED_POINTS_MAPPER_H_INCLUDED



// System includes
#include <set>


// External includes
#include "boost/smart_ptr.hpp"


// Project includes
#include "includes/define.h"
Expand Down
2 changes: 1 addition & 1 deletion applications/FemToDemApplication/custom_python/add_custom_processes_to_python.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#define KRATOS_ADD_PROCESSES_TO_PYTHON_H_INCLUDED

// System includes

// External includes
//#include "boost/smart_ptr.hpp"
#include <pybind11/pybind11.h>

#include "includes/define_python.h"
Expand Down
4 changes: 0 additions & 4 deletions applications/FemToDemApplication/custom_python/add_custom_strategies_to_python.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,11 @@
#define KRATOS_STRATEGIES_PYTHON_H_INCLUDED



// System includes


// External includes
//#include "boost/smart_ptr.hpp"
#include <pybind11/pybind11.h>


// Project includes
#include "includes/define.h"

Expand Down
1 change: 0 additions & 1 deletion applications/FluidDynamicsApplication/custom_elements/navier_stokes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// System includes

// External includes
#include "boost/smart_ptr.hpp"

// Project includes
#include "includes/define.h"
Expand Down
3 changes: 0 additions & 3 deletions applications/FluidDynamicsApplication/custom_elements/stokes_3D_twofluid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@

// System includes


// External includes
#include "boost/smart_ptr.hpp"


// Project includes
#include "includes/define.h"
Expand Down
1 change: 0 additions & 1 deletion ...n/custom_strategies/builder_and_solvers/residualbased_block_builder_and_solver_periodic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#endif

/* External includes */
#include "boost/smart_ptr.hpp"
#include "utilities/timer.h"

/* Project includes */
Expand Down
2 changes: 0 additions & 2 deletions ...om_strategies/schemes/residualbased_predictorcorrector_velocity_bossak_scheme_turbulent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@

/* System includes */


/* External includes */
#include "boost/smart_ptr.hpp"

/* Project includes */
#include "includes/define.h"
Expand Down
1 change: 0 additions & 1 deletion applications/PFEM2Application/custom_conditions/fixed_pressure_2d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#define KRATOS_FIXED_PRESSURE_CONDITION_H_INCLUDED

// External includes
#include "boost/smart_ptr.hpp"

// Project includes
#include "includes/define.h"
Expand Down
1 change: 0 additions & 1 deletion applications/PFEM2Application/custom_conditions/fixed_pressure_3d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#define KRATOS_FIXED_PRESSURE_3D_CONDITION_H_INCLUDED

// External includes
#include "boost/smart_ptr.hpp"

// Project includes
#include "includes/define.h"
Expand Down
1 change: 0 additions & 1 deletion applications/PFEM2Application/custom_conditions/fixed_velocity_2d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#define KRATOS_FIXED_VELOCITY_CONDITION_H_INCLUDED

// External includes
#include "boost/smart_ptr.hpp"

// Project includes
#include "includes/define.h"
Expand Down
1 change: 0 additions & 1 deletion applications/PFEM2Application/custom_conditions/fixed_velocity_3d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#define KRATOS_FIXED_VELOCITY_CONDITION_3D_H_INCLUDED

// External includes
#include "boost/smart_ptr.hpp"

// Project includes
#include "includes/define.h"
Expand Down
1 change: 0 additions & 1 deletion applications/PFEM2Application/custom_conditions/water_fixed_velocity_2d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#define KRATOS_WATER_FIXED_VELOCITY_CONDITION_H_INCLUDED

// External includes
#include "boost/smart_ptr.hpp"

// Project includes
#include "includes/define.h"
Expand Down
4 changes: 1 addition & 3 deletions applications/PFEM2Application/custom_elements/fractional_step_pfem_2_2d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@
#if !defined(KRATOS_FRACTIONAL_STEP_PFEM_2_2D_ELEM_H_INCLUDED)
#define KRATOS_FRACTIONAL_STEP_PFEM_2_2D_ELEM_H_INCLUDED

// System includes

// System includes

// External includes
#include "boost/smart_ptr.hpp"


// Project includes
#include "includes/define.h"
Expand Down
3 changes: 0 additions & 3 deletions applications/PFEM2Application/custom_elements/fractional_step_pfem_2_3d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@

// System includes


// External includes
#include "boost/smart_ptr.hpp"


// Project includes
#include "includes/define.h"
Expand Down
4 changes: 0 additions & 4 deletions applications/PFEM2Application/custom_elements/monolithic_2fluid_2d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@

// System includes


// External includes
#include "boost/smart_ptr.hpp"


// Project includes
#include "includes/define.h"
Expand All @@ -23,7 +20,6 @@
#include "custom_utilities/pfem_particle_fluidonly.h"



namespace Kratos
{

Expand Down
3 changes: 0 additions & 3 deletions applications/PFEM2Application/custom_elements/monolithic_2fluid_2d_partintegration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@

// System includes


// External includes
#include "boost/smart_ptr.hpp"


// Project includes
#include "includes/define.h"
Expand Down
3 changes: 0 additions & 3 deletions applications/PFEM2Application/custom_elements/monolithic_2fluid_3d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@

// System includes


// External includes
#include "boost/smart_ptr.hpp"


// Project includes
#include "includes/define.h"
Expand Down
3 changes: 0 additions & 3 deletions applications/PFEM2Application/custom_elements/monolithic_2fluid_3d_partintegration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@

// System includes


// External includes
#include "boost/smart_ptr.hpp"


// Project includes
#include "includes/define.h"
Expand Down
3 changes: 0 additions & 3 deletions applications/PFEM2Application/custom_elements/monolithic_3fluid_2d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@

// System includes


// External includes
#include "boost/smart_ptr.hpp"


// Project includes
#include "includes/define.h"
Expand Down
3 changes: 0 additions & 3 deletions applications/PFEM2Application/custom_elements/monolithic_3fluid_3d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@

// System includes


// External includes
#include "boost/smart_ptr.hpp"


// Project includes
#include "includes/define.h"
Expand Down
2 changes: 0 additions & 2 deletions applications/PFEM2Application/custom_elements/nonewtonian_2fluid_2d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define KRATOS_MONOLITHIC_NONEWTONIAN_PFEM2_2D_ELEM_H_INCLUDED

// External includes
#include "boost/smart_ptr.hpp"


// Project includes
#include "includes/define.h"
Expand Down
2 changes: 0 additions & 2 deletions applications/PFEM2Application/custom_elements/nonewtonian_2fluid_3d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define KRATOS_MONOLITHIC_NONEWTONIAN_PFEM2_3D_ELEM_H_INCLUDED

// External includes
#include "boost/smart_ptr.hpp"


// Project includes
#include "includes/define.h"
Expand Down
4 changes: 0 additions & 4 deletions applications/PFEM2Application/custom_elements/qfluid_2d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,9 @@
#define KRATOS_FLUID_2Dp_GLS_H_INCLUDED



// System includes


// External includes
#include "boost/smart_ptr.hpp"


// Project includes
#include "includes/define.h"
Expand Down
4 changes: 0 additions & 4 deletions applications/PFEM2Application/custom_elements/qfluid_3d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,9 @@
#define KRATOS_FLUID_3Dp_GLS_H_INCLUDED



// System includes


// External includes
#include "boost/smart_ptr.hpp"


// Project includes
#include "includes/define.h"
Expand Down
Loading