Skip to content

Commit 7445455

Browse files
roigcarloroigcarlo
committed
Merge branch 'master' into dependabot/github_actions/actions/checkout-6
2 parents 6377586 + a763d6c commit 7445455

807 files changed

Lines changed: 56015 additions & 4626 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ jobs:
322322

323323
- name: CI configuration
324324
shell: bash
325-
run: python3.8 kratos/python_scripts/testing/ci_utilities.py
325+
run: /usr/local/bin/python3.10 kratos/python_scripts/testing/ci_utilities.py
326326

327327
- name: Build
328328
run: |
@@ -336,14 +336,14 @@ jobs:
336336
if [ -f /etc/bashrc ]; then source /etc/bashrc; fi
337337
export PYTHONPATH=${GITHUB_WORKSPACE}/bin/Custom
338338
export LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/bin/Custom/libs
339-
python3.8 kratos/python_scripts/testing/run_cpp_tests.py
339+
/usr/local/bin/python3.10 kratos/python_scripts/testing/run_cpp_tests.py
340340
341341
- name: Running python tests
342342
run: |
343343
if [ -f /etc/bashrc ]; then source /etc/bashrc; fi
344344
export PYTHONPATH=${GITHUB_WORKSPACE}/bin/Custom
345345
export LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/bin/Custom/libs
346-
python3.8 kratos/python_scripts/testing/run_python_tests.py -l nightly -c python3.8
346+
/usr/local/bin/python3.10 kratos/python_scripts/testing/run_python_tests.py -l nightly -c /usr/local/bin/python3.10
347347
348348
349349
ubuntu-core-without-unity:
@@ -392,6 +392,8 @@ jobs:
392392
cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \
393393
-DUSE_MPI=ON \
394394
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
395+
-DBOOST_ROOT="/workspace/boost/boost_1_87_0" \
396+
-DBoost_NO_SYSTEM_PATHS=ON \
395397
-DTRILINOS_INCLUDE_DIR="/usr/include/trilinos" \
396398
-DTRILINOS_LIBRARY_DIR="/usr/lib/x86_64-linux-gnu" \
397399
-DTRILINOS_LIBRARY_PREFIX="trilinos_" \
@@ -518,7 +520,7 @@ jobs:
518520
-DBOOST_ROOT="%TEMP%\boost" ^
519521
-DCMAKE_CXX_FLAGS="/Od /we4661 /we4804 /WX /wd4996" ^
520522
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 ^
521-
-DKRATOS_USE_PCH=ON ^
523+
-DKRATOS_USE_PCH=OFF ^
522524
-DFORCE_LOCAL_ZLIB_COMPILATION=ON || goto :error
523525
524526
cmake --build "%KRATOS_BUILD%\%KRATOS_BUILD_TYPE%" --target all_build -- /property:configuration=%KRATOS_BUILD_TYPE% /p:Platform=x64 || goto :error

‎.github/workflows/intel_configure.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \
6060
${KRATOS_CMAKE_OPTIONS_FLAGS} \
6161
-DUSE_MPI=ON \
6262
-DPYTHON_EXECUTABLE="/usr/bin/python3.10" \
63+
-DBOOST_ROOT="/workspace/boost/boost_1_87_0" \
64+
-DBoost_NO_SYSTEM_PATHS=ON \
6365
-DCMAKE_CXX_FLAGS="${KRATOS_CMAKE_CXX_FLAGS} -O3 -Wall -Werror-all -diag-disable 1478 -diag-disable 1786" \
6466
-DTRILINOS_INCLUDE_DIR="/usr/include/trilinos" \
6567
-DTRILINOS_LIBRARY_DIR="/usr/lib/x86_64-linux-gnu" \

‎CMakeLists.txt‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required (VERSION 3.15.0)
22

33
project (KratosMultiphysics)
4-
set (CMAKE_CXX_STANDARD 17)
4+
set (CMAKE_CXX_STANDARD 20)
55
set (CMAKE_CXX_STANDARD_REQUIRED ON)
66
set (CMAKE_CXX_EXTENSIONS OFF)
77

@@ -50,7 +50,7 @@ endif(POLICY CMP0167)
5050

5151
# Set here the version number **** only update upon tagging a release!
5252
set (KratosMultiphysics_MAJOR_VERSION 10)
53-
set (KratosMultiphysics_MINOR_VERSION 3)
53+
set (KratosMultiphysics_MINOR_VERSION 4)
5454
set (KratosMultiphysics_PATCH_VERSION 0)
5555

5656
# If KRATOS_SOURCE_DIR is not defined use the CMAKE_SOURCE_DIR
@@ -170,6 +170,11 @@ ELSE(CMAKE_VERSION VERSION_LESS "3.16.0")
170170
ENDIF(CMAKE_UNITY_BUILD MATCHES ON)
171171
ENDIF(CMAKE_VERSION VERSION_LESS "3.16.0")
172172

173+
# Add /utf-8 as a source file encoding flag for MSVC
174+
if(MSVC)
175+
add_compile_options("/utf-8")
176+
endif()
177+
173178
# Get subversion data. This is done automagically by the cmakes
174179
include (GenerateExportHeader)
175180

@@ -722,12 +727,6 @@ endforeach()
722727
message("\n***********************************************************************\n")
723728

724729
message("\nList of upcoming API-breaking and behavior changes:")
725-
message("\t Geometry 'Dimension' removed: https://github.com/KratosMultiphysics/Kratos/pull/10977")
726-
message("\t Geometry old projection methods deprecation: https://github.com/KratosMultiphysics/Kratos/pull/9024")
727-
message("\t Geometry old closest point methods deprecation: https://github.com/KratosMultiphysics/Kratos/pull/9243")
728-
message("\t Model 'CreateModelPart' behavior change (no error thrown if model part exists): https://github.com/KratosMultiphysics/Kratos/pull/9598")
729-
message("\t Make GetIntegrationMethod method of Condition const: https://github.com/KratosMultiphysics/Kratos/pull/9769")
730-
message("\t Behavior change of ModelPart.GetProperties (MeshIndex removed): https://github.com/KratosMultiphysics/Kratos/pull/9774")
731730
message("\t Behavior change of Testing. Please ensure you use KRATOS_EXPECT for testing instead of KRATOS_CHECK")
732731
message("\t Removal of misused EXTENDED_GAUSS integration rules and unification across geometries: https://github.com/KratosMultiphysics/Kratos/pull/13444")
733732

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44

55
[![Release][release-image]][releases]
66
<a href="https://github.com/KratosMultiphysics/Kratos/releases/latest"><img src="https://img.shields.io/github/release-date/KratosMultiphysics/Kratos?label="></a>
7-
<a href="https://github.com/KratosMultiphysics/Kratos/compare/Release-10.3.0...master"><img src="https://img.shields.io/github/commits-since/KratosMultiphysics/Kratos/latest?label=commits%20since"></a>
7+
<a href="https://github.com/KratosMultiphysics/Kratos/compare/Release-10.4.0...master"><img src="https://img.shields.io/github/commits-since/KratosMultiphysics/Kratos/latest?label=commits%20since"></a>
88
<a href="https://github.com/KratosMultiphysics/Kratos/commit/master"><img src="https://img.shields.io/github/last-commit/KratosMultiphysics/Kratos?label=latest%20commit"></a>
99

1010
[![PyPI pyversions](https://img.shields.io/pypi/pyversions/KratosMultiphysics.svg)](https://pypi.org/project/KratosMultiphysics/)
1111
[![Downloads](https://pepy.tech/badge/KratosMultiphysics/month)](https://pepy.tech/project/KratosMultiphysics)
1212

13-
[release-image]: https://img.shields.io/badge/release-10.3.0-green.svg?style=flat
13+
[release-image]: https://img.shields.io/badge/release-10.4.0-green.svg?style=flat
1414
[releases]: https://github.com/KratosMultiphysics/Kratos/releases
1515

1616
[license-image]: https://img.shields.io/badge/license-BSD-green.svg?style=flat
1717
[license]: https://github.com/KratosMultiphysics/Kratos/blob/master/kratos/license.txt
1818

19-
[c++-image]: https://img.shields.io/badge/C++-17-blue.svg?style=flat&logo=c%2B%2B
19+
[c++-image]: https://img.shields.io/badge/C++-20-blue.svg?style=flat&logo=c%2B%2B
2020
[c++standard]: https://isocpp.org/std/the-standard
2121

2222
[Nightly-Build]: https://github.com/KratosMultiphysics/Kratos/workflows/Nightly%20Build/badge.svg

‎applications/CSharpWrapperApplication/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
## CSharp Wrapper Application

‎applications/CSharpWrapperApplication/pyproject.toml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
[build-system]
2+
requires = ["hatchling"]
3+
build-backend = "hatchling.build"
4+
5+
[project]
6+
name = "KratosCSharpWrapperApplication"
7+
description = """
8+
KRATOS Multiphysics ("Kratos") is a framework for building parallel,
9+
multi-disciplinary simulation software, aiming at modularity,
10+
extensibility, and high performance. Kratos is written in C++,
11+
and counts with an extensive Python interface.
12+
"""
13+
14+
readme = {"file" = "README.md", "content-type" = "text/markdown"}
15+
license = {text = "BSD-4-Clause"}
16+
authors = [
17+
{name="Kratos Team", email="kratos@listas.cimne.upc.edu"}
18+
]
19+
requires-python = ">=3.8"
20+
dependencies = [
21+
"KratosMultiphysics=={env:KRATOS_VERSION}"
22+
]
23+
classifiers = [
24+
"Programming Language :: Python :: 3",
25+
"Programming Language :: C++",
26+
"Topic :: Scientific/Engineering"
27+
]
28+
dynamic = ["version"]
29+
30+
# List of binaries for this application
31+
# (This is a Kratos build script extension and will not work with python build)
32+
[kratos]
33+
libs = ["KratosCSharpWrapperApplication.*", "KratosCSharpWrapperCore.*", "libKratosCSharpWrapperCore.*"]
34+
35+
# Wheel (py and stubs)
36+
[tool.hatch.build.targets.wheel]
37+
include = [
38+
"KratosMultiphysics/CSharpWrapperApplication/**/*.py*"
39+
]
40+
41+
# # Hook to Build Properties
42+
[tool.hatch.build.targets.wheel.hooks.custom]
43+
path = "hatch_build.py"
44+
45+
# Wheel (dll, so, binary dependencies)
46+
[tool.hatch.build.targets.wheel.force-include]
47+
libs = "KratosMultiphysics/.libs"
48+
49+
# Editable (py and stubs)
50+
[tool.hatch.build.targets.editable]
51+
include = [
52+
"KratosMultiphysics/CSharpWrapperApplication/**/*.py*"
53+
]
54+
55+
# Editable (dll, so, binary dependencies)
56+
[tool.hatch.build.targets.editable.force-include]
57+
libs = "KratosMultiphysics/.libs"
58+
59+
# Hook to Metadata
60+
[tool.hatch.metadata.hooks.custom]
61+
path = "hatch_build.py"

‎applications/CableNetApplication/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
## Cable Net Application

‎applications/CableNetApplication/pyproject.toml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
[build-system]
2+
requires = ["hatchling"]
3+
build-backend = "hatchling.build"
4+
5+
[project]
6+
name = "KratosCableNetApplication"
7+
description = """
8+
KRATOS Multiphysics ("Kratos") is a framework for building parallel,
9+
multi-disciplinary simulation software, aiming at modularity,
10+
extensibility, and high performance. Kratos is written in C++,
11+
and counts with an extensive Python interface.
12+
"""
13+
14+
readme = {"file" = "README.md", "content-type" = "text/markdown"}
15+
license = {text = "BSD-4-Clause"}
16+
authors = [
17+
{name="Kratos Team", email="kratos@listas.cimne.upc.edu"}
18+
]
19+
requires-python = ">=3.8"
20+
dependencies = [
21+
"KratosMultiphysics=={env:KRATOS_VERSION}"
22+
]
23+
classifiers = [
24+
"Programming Language :: Python :: 3",
25+
"Programming Language :: C++",
26+
"Topic :: Scientific/Engineering"
27+
]
28+
dynamic = ["version"]
29+
30+
# List of binaries for this application
31+
# (This is a Kratos build script extension and will not work with python build)
32+
[kratos]
33+
libs = ["KratosCableNetApplication.*", "KratosCableNetCore.*", "libKratosCableNetCore.*"]
34+
35+
# Wheel (py and stubs)
36+
[tool.hatch.build.targets.wheel]
37+
include = [
38+
"KratosMultiphysics/CableNetApplication/**/*.py*"
39+
]
40+
41+
# # Hook to Build Properties
42+
[tool.hatch.build.targets.wheel.hooks.custom]
43+
path = "hatch_build.py"
44+
45+
# Wheel (dll, so, binary dependencies)
46+
[tool.hatch.build.targets.wheel.force-include]
47+
libs = "KratosMultiphysics/.libs"
48+
49+
# Editable (py and stubs)
50+
[tool.hatch.build.targets.editable]
51+
include = [
52+
"KratosMultiphysics/CableNetApplication/**/*.py*"
53+
]
54+
55+
# Editable (dll, so, binary dependencies)
56+
[tool.hatch.build.targets.editable.force-include]
57+
libs = "KratosMultiphysics/.libs"
58+
59+
# Hook to Metadata
60+
[tool.hatch.metadata.hooks.custom]
61+
path = "hatch_build.py"

‎applications/ChimeraApplication/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
## Chimera Application

‎applications/ChimeraApplication/pyproject.toml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
[build-system]
2+
requires = ["hatchling"]
3+
build-backend = "hatchling.build"
4+
5+
[project]
6+
name = "KratosChimeraApplication"
7+
description = """
8+
KRATOS Multiphysics ("Kratos") is a framework for building parallel,
9+
multi-disciplinary simulation software, aiming at modularity,
10+
extensibility, and high performance. Kratos is written in C++,
11+
and counts with an extensive Python interface.
12+
"""
13+
14+
readme = {"file" = "README.md", "content-type" = "text/markdown"}
15+
license = {text = "BSD-4-Clause"}
16+
authors = [
17+
{name="Kratos Team", email="kratos@listas.cimne.upc.edu"}
18+
]
19+
requires-python = ">=3.8"
20+
dependencies = [
21+
"KratosMultiphysics=={env:KRATOS_VERSION}"
22+
]
23+
classifiers = [
24+
"Programming Language :: Python :: 3",
25+
"Programming Language :: C++",
26+
"Topic :: Scientific/Engineering"
27+
]
28+
dynamic = ["version"]
29+
30+
# List of binaries for this application
31+
# (This is a Kratos build script extension and will not work with python build)
32+
[kratos]
33+
libs = ["KratosChimeraApplication.*", "KratosChimeraCore.*", "libKratosChimeraCore.*"]
34+
35+
# Wheel (py and stubs)
36+
[tool.hatch.build.targets.wheel]
37+
include = [
38+
"KratosMultiphysics/ChimeraApplication/**/*.py*"
39+
]
40+
41+
# # Hook to Build Properties
42+
[tool.hatch.build.targets.wheel.hooks.custom]
43+
path = "hatch_build.py"
44+
45+
# Wheel (dll, so, binary dependencies)
46+
[tool.hatch.build.targets.wheel.force-include]
47+
libs = "KratosMultiphysics/.libs"
48+
49+
# Editable (py and stubs)
50+
[tool.hatch.build.targets.editable]
51+
include = [
52+
"KratosMultiphysics/ChimeraApplication/**/*.py*"
53+
]
54+
55+
# Editable (dll, so, binary dependencies)
56+
[tool.hatch.build.targets.editable.force-include]
57+
libs = "KratosMultiphysics/.libs"
58+
59+
# Hook to Metadata
60+
[tool.hatch.metadata.hooks.custom]
61+
path = "hatch_build.py"

0 commit comments

Comments
 (0)