Skip to content

Commit b29eccb

Browse files
authored
Merge pull request #12853 from KratosMultiphysics/Release-10.0
[Core] Bump to 10.0
2 parents bcc5801 + bdbbe05 commit b29eccb

11 files changed

Lines changed: 28 additions & 15 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ if(POLICY CMP0135)
3939
endif(POLICY CMP0135)
4040

4141
# Set here the version number **** only update upon tagging a release!
42-
set (KratosMultiphysics_MAJOR_VERSION 9)
43-
set (KratosMultiphysics_MINOR_VERSION 5)
42+
set (KratosMultiphysics_MAJOR_VERSION 10)
43+
set (KratosMultiphysics_MINOR_VERSION 0)
4444
set (KratosMultiphysics_PATCH_VERSION 0)
4545

4646
# If KRATOS_SOURCE_DIR is not defined use the CMAKE_SOURCE_DIR

applications/HDF5Application/custom_io/hdf5_file.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ namespace Internals
460460
* Valid paths are similar to linux file system with alphanumeric names
461461
* and possible underscores separated by '/'. All paths are absolute.
462462
*/
463-
bool KRATOS_API(HDF5_APPLICATION) IsPath(const std::string& rPath);
463+
KRATOS_API(HDF5_APPLICATION) bool IsPath(const std::string& rPath);
464464

465465
/// Return vector of non-empty substrings separated by a delimiter.
466466
std::vector<std::string> Split(const std::string& rPath, char Delimiter);
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"wheel_name": "KratosSystemIdentificationApplication",
3+
"included_modules": ["SystemIdentificationApplication"],
4+
"included_binaries": ["KratosSystemIdentificationApplication.*", "KratosSystemIdentificationCore.*", "libKratosSystemIdentificationCore.*"],
5+
"dependencies": ["KratosMultiphysics==${KRATOS_VERSION}"],
6+
"author": "Kratos Team",
7+
"author_email": "kratos@listas.cimne.upc.edu",
8+
"description": "KRATOS Multiphysics (\"Kratos\") is a framework for building parallel, multi-disciplinary simulation software, aiming at modularity, extensibility, and high performance. Kratos is written in C++, and counts with an extensive Python interface.",
9+
"readme": "scripts/wheels/README.md"
10+
}

scripts/wheels/build_release_linux.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$RELEASE_BRANCH="Release-9.5"
1+
$RELEASE_BRANCH="Release-10.0"
22

33
$HOST_SWAP="C:/data_swap_host"
44
$GUEST_SWAP="/data_swap_guest"

scripts/wheels/build_release_windows.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$RELEASE_BRANCH="Release-9.5"
1+
$RELEASE_BRANCH="Release-10.0"
22

33
$HOST_SWAP="C:/data_swap_host"
44
$GUEST_SWAP="C:/data_swap_guest"

scripts/wheels/linux/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
PYTHONS=("cp38" "cp39" "cp310" "cp311" "cp12")
3-
export KRATOS_VERSION="9.5"
3+
export KRATOS_VERSION="10.0.0"
44

55
BASE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
66
export KRATOS_ROOT="/workspace/kratos/Kratos"

scripts/wheels/linux/build_mpi.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
PYTHONS=("cp38" "cp39" "cp310" "cp311" "cp312")
3-
export KRATOS_VERSION="9.5"
3+
export KRATOS_VERSION="10.0.0"
44

55
BASE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
66
export KRATOS_ROOT="/workspace/kratos/Kratos"

scripts/wheels/linux/configure.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ add_app ${KRATOS_APP_DIR}/LinearSolversApplication;
3535
add_app ${KRATOS_APP_DIR}/ConstitutiveLawsApplication;
3636
# add_app ${KRATOS_APP_DIR}/FemToDemApplication;
3737
# add_app ${KRATOS_APP_DIR}/PfemFluidDynamicsApplication;
38-
add_app ${KRATOS_APP_DIR}/DelaunayMeshingApplication;
38+
# add_app ${KRATOS_APP_DIR}/DelaunayMeshingApplication;
3939
add_app ${KRATOS_APP_DIR}/MeshingApplication;
4040
add_app ${KRATOS_APP_DIR}/DemStructuresCouplingApplication;
4141
add_app ${KRATOS_APP_DIR}/MeshMovingApplication;
@@ -54,6 +54,7 @@ add_app ${KRATOS_APP_DIR}/RomApplication;
5454
add_app ${KRATOS_APP_DIR}/ShallowWaterApplication;
5555
add_app ${KRATOS_APP_DIR}/OptimizationApplication;
5656
add_app ${KRATOS_APP_DIR}/GeoMechanicsApplication;
57+
add_app ${KRATOS_APP_DIR}/SystemIdentificationApplication;
5758

5859
# Clean
5960
rm -rf "${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}/cmake_install.cmake"
@@ -73,5 +74,5 @@ cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \
7374
-DBLAS_LIBRARIES="/usr/lib64/libblas.so.3" \
7475
-DINCLUDE_MMG=ON \
7576
-DMMG_ROOT="/workspace/external_libraries/mmg/mmg_5_5_1" \
76-
-DKRATOS_BUILD_TESTING=ON \
77+
-DKRATOS_BUILD_TESTING=OFF \
7778
-DKRATOS_GENERATE_PYTHON_STUBS=ON \

scripts/wheels/linux/configure_mpi.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ add_app ${KRATOS_APP_DIR}/FSIApplication;
3434
add_app ${KRATOS_APP_DIR}/SwimmingDEMApplication;
3535
add_app ${KRATOS_APP_DIR}/LinearSolversApplication;
3636
add_app ${KRATOS_APP_DIR}/ConstitutiveLawsApplication;
37-
add_app ${KRATOS_APP_DIR}/FemToDemApplication;
38-
add_app ${KRATOS_APP_DIR}/PfemFluidDynamicsApplication;
39-
add_app ${KRATOS_APP_DIR}/DelaunayMeshingApplication;
37+
# add_app ${KRATOS_APP_DIR}/FemToDemApplication;
38+
# add_app ${KRATOS_APP_DIR}/PfemFluidDynamicsApplication;
39+
# add_app ${KRATOS_APP_DIR}/DelaunayMeshingApplication;
4040
add_app ${KRATOS_APP_DIR}/MeshingApplication;
4141
add_app ${KRATOS_APP_DIR}/MetisApplication;
4242
add_app ${KRATOS_APP_DIR}/DemStructuresCouplingApplication;
@@ -56,6 +56,7 @@ add_app ${KRATOS_APP_DIR}/RomApplication;
5656
add_app ${KRATOS_APP_DIR}/ShallowWaterApplication;
5757
add_app ${KRATOS_APP_DIR}/OptimizationApplication;
5858
add_app ${KRATOS_APP_DIR}/GeoMechanicsApplication;
59+
add_app ${KRATOS_APP_DIR}/SystemIdentificationApplication;
5960

6061
# Clean
6162
rm -rf "${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}/cmake_install.cmake"
@@ -76,5 +77,5 @@ cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \
7677
-DBOOST_ROOT="/workspace/boost/boost_1_74_0" \
7778
-DINCLUDE_MMG=ON \
7879
-DMMG_ROOT="/workspace/external_libraries/mmg/mmg_5_5_1" \
79-
-DKRATOS_BUILD_TESTING=ON \
80+
-DKRATOS_BUILD_TESTING=OFF \
8081
-DKRATOS_GENERATE_PYTHON_STUBS=ON \

scripts/wheels/windows/build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
param([System.String]$cotire="OFF")
22

33
$pythons = "38", "39", "310", "311", "312"
4-
$env:kratos_version = "9.5.0"
4+
$env:kratos_version = "10.0.0"
55

66
$kratosRoot = "c:\kratos\kratos"
77
$env:kratos_root = $kratosRoot

0 commit comments

Comments
 (0)