Merge pull request #12853 from KratosMultiphysics/Release-10.0

[Core] Bump to 10.0
KratosMultiphysics · Nov 18, 2024 · b29eccb · b29eccb
2 parents bcc5801 + bdbbe05
commit b29eccb
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,8 +39,8 @@ if(POLICY CMP0135)
 endif(POLICY CMP0135)
 
 # Set here the version number **** only update upon tagging a release!
-set (KratosMultiphysics_MAJOR_VERSION 9)
-set (KratosMultiphysics_MINOR_VERSION 5)
+set (KratosMultiphysics_MAJOR_VERSION 10)
+set (KratosMultiphysics_MINOR_VERSION 0)
 set (KratosMultiphysics_PATCH_VERSION 0)
 
 # If KRATOS_SOURCE_DIR is not defined use the CMAKE_SOURCE_DIR

diff --git a/applications/HDF5Application/custom_io/hdf5_file.h b/applications/HDF5Application/custom_io/hdf5_file.h
@@ -460,7 +460,7 @@ namespace Internals
  * Valid paths are similar to linux file system with alphanumeric names
  * and possible underscores separated by '/'. All paths are absolute.
  */
-bool KRATOS_API(HDF5_APPLICATION) IsPath(const std::string& rPath);
+KRATOS_API(HDF5_APPLICATION) bool IsPath(const std::string& rPath);
 
 /// Return vector of non-empty substrings separated by a delimiter.
 std::vector<std::string> Split(const std::string& rPath, char Delimiter);

diff --git a/applications/SystemIdentificationApplication/SystemIdentificationApplication.json b/applications/SystemIdentificationApplication/SystemIdentificationApplication.json
@@ -0,0 +1,10 @@
+{
+	"wheel_name": "KratosSystemIdentificationApplication",
+	"included_modules": ["SystemIdentificationApplication"],
+	"included_binaries": ["KratosSystemIdentificationApplication.*", "KratosSystemIdentificationCore.*", "libKratosSystemIdentificationCore.*"],
+	"dependencies": ["KratosMultiphysics==${KRATOS_VERSION}"],
+	"author": "Kratos Team",
+	"author_email": "[email protected]",
+	"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.",
+	"readme": "scripts/wheels/README.md"
+}
diff --git a/scripts/wheels/build_release_linux.ps1 b/scripts/wheels/build_release_linux.ps1
@@ -1,4 +1,4 @@
-$RELEASE_BRANCH="Release-9.5"
+$RELEASE_BRANCH="Release-10.0"
 
 $HOST_SWAP="C:/data_swap_host"
 $GUEST_SWAP="/data_swap_guest"

diff --git a/scripts/wheels/build_release_windows.ps1 b/scripts/wheels/build_release_windows.ps1
@@ -1,4 +1,4 @@
-$RELEASE_BRANCH="Release-9.5"
+$RELEASE_BRANCH="Release-10.0"
 
 $HOST_SWAP="C:/data_swap_host"
 $GUEST_SWAP="C:/data_swap_guest"

diff --git a/scripts/wheels/linux/build.sh b/scripts/wheels/linux/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 PYTHONS=("cp38" "cp39" "cp310" "cp311" "cp12")
-export KRATOS_VERSION="9.5"
+export KRATOS_VERSION="10.0.0"
 
 BASE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 export KRATOS_ROOT="/workspace/kratos/Kratos"

diff --git a/scripts/wheels/linux/build_mpi.sh b/scripts/wheels/linux/build_mpi.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 PYTHONS=("cp38" "cp39" "cp310" "cp311" "cp312")
-export KRATOS_VERSION="9.5"
+export KRATOS_VERSION="10.0.0"
 
 BASE_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 export KRATOS_ROOT="/workspace/kratos/Kratos"

diff --git a/scripts/wheels/linux/configure.sh b/scripts/wheels/linux/configure.sh
@@ -35,7 +35,7 @@ add_app ${KRATOS_APP_DIR}/LinearSolversApplication;
 add_app ${KRATOS_APP_DIR}/ConstitutiveLawsApplication;
 # add_app ${KRATOS_APP_DIR}/FemToDemApplication;
 # add_app ${KRATOS_APP_DIR}/PfemFluidDynamicsApplication;
-add_app ${KRATOS_APP_DIR}/DelaunayMeshingApplication;
+# add_app ${KRATOS_APP_DIR}/DelaunayMeshingApplication;
 add_app ${KRATOS_APP_DIR}/MeshingApplication;
 add_app ${KRATOS_APP_DIR}/DemStructuresCouplingApplication;
 add_app ${KRATOS_APP_DIR}/MeshMovingApplication;
@@ -54,6 +54,7 @@ add_app ${KRATOS_APP_DIR}/RomApplication;
 add_app ${KRATOS_APP_DIR}/ShallowWaterApplication;
 add_app ${KRATOS_APP_DIR}/OptimizationApplication;
 add_app ${KRATOS_APP_DIR}/GeoMechanicsApplication;
+add_app ${KRATOS_APP_DIR}/SystemIdentificationApplication;
 
 # Clean
 rm -rf "${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}/cmake_install.cmake"
@@ -73,5 +74,5 @@ cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \
 -DBLAS_LIBRARIES="/usr/lib64/libblas.so.3"                             \
 -DINCLUDE_MMG=ON                                                       \
 -DMMG_ROOT="/workspace/external_libraries/mmg/mmg_5_5_1"               \
--DKRATOS_BUILD_TESTING=ON                                              \
+-DKRATOS_BUILD_TESTING=OFF                                             \
 -DKRATOS_GENERATE_PYTHON_STUBS=ON                                      \
diff --git a/scripts/wheels/linux/configure_mpi.sh b/scripts/wheels/linux/configure_mpi.sh
@@ -34,9 +34,9 @@ add_app ${KRATOS_APP_DIR}/FSIApplication;
 add_app ${KRATOS_APP_DIR}/SwimmingDEMApplication;
 add_app ${KRATOS_APP_DIR}/LinearSolversApplication;
 add_app ${KRATOS_APP_DIR}/ConstitutiveLawsApplication;
-add_app ${KRATOS_APP_DIR}/FemToDemApplication;
-add_app ${KRATOS_APP_DIR}/PfemFluidDynamicsApplication;
-add_app ${KRATOS_APP_DIR}/DelaunayMeshingApplication;
+# add_app ${KRATOS_APP_DIR}/FemToDemApplication;
+# add_app ${KRATOS_APP_DIR}/PfemFluidDynamicsApplication;
+# add_app ${KRATOS_APP_DIR}/DelaunayMeshingApplication;
 add_app ${KRATOS_APP_DIR}/MeshingApplication;
 add_app ${KRATOS_APP_DIR}/MetisApplication;
 add_app ${KRATOS_APP_DIR}/DemStructuresCouplingApplication;
@@ -56,6 +56,7 @@ add_app ${KRATOS_APP_DIR}/RomApplication;
 add_app ${KRATOS_APP_DIR}/ShallowWaterApplication;
 add_app ${KRATOS_APP_DIR}/OptimizationApplication;
 add_app ${KRATOS_APP_DIR}/GeoMechanicsApplication;
+add_app ${KRATOS_APP_DIR}/SystemIdentificationApplication;
 
 # Clean
 rm -rf "${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}/cmake_install.cmake"
@@ -76,5 +77,5 @@ cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \
 -DBOOST_ROOT="/workspace/boost/boost_1_74_0"                           \
 -DINCLUDE_MMG=ON                                                       \
 -DMMG_ROOT="/workspace/external_libraries/mmg/mmg_5_5_1"               \
--DKRATOS_BUILD_TESTING=ON                                              \
+-DKRATOS_BUILD_TESTING=OFF                                             \
 -DKRATOS_GENERATE_PYTHON_STUBS=ON                                      \
diff --git a/scripts/wheels/windows/build.ps1 b/scripts/wheels/windows/build.ps1
@@ -1,7 +1,7 @@
 param([System.String]$cotire="OFF")
 
 $pythons = "38", "39", "310", "311", "312"
-$env:kratos_version = "9.5.0"
+$env:kratos_version = "10.0.0"
 
 $kratosRoot = "c:\kratos\kratos"
 $env:kratos_root = $kratosRoot

diff --git a/scripts/wheels/windows/configure.bat b/scripts/wheels/windows/configure.bat
@@ -46,6 +46,7 @@ CALL :add_app %KRATOS_APP_DIR%\RomApplication;
 CALL :add_app %KRATOS_APP_DIR%\ShallowWaterApplication;
 CALL :add_app %KRATOS_APP_DIR%\OptimizationApplication;
 CALL :add_app %KRATOS_APP_DIR%\GeoMechanicsApplication;
+CALL :add_app %KRATOS_APP_DIR%\SystemIdentificationApplication;
 
 del /F /Q "%KRATOS_BUILD%\%KRATOS_BUILD_TYPE%\cmake_install.cmake"
 del /F /Q "%KRATOS_BUILD%\%KRATOS_BUILD_TYPE%\CMakeCache.txt"
@@ -61,7 +62,7 @@ cmake -G"Visual Studio 16 2019" -H"%KRATOS_SOURCE%" -B"%KRATOS_BUILD%\%KRATOS_BU
 -DCMAKE_C_FLAGS="/MP24 /Gm- /Zm10"                                                          ^
 -DCMAKE_CXX_FLAGS="/MP24 /Gm- /Zm10"                                                        ^
 -DBOOST_ROOT=%BOOST_ROOT%                                                                   ^
--DKRATOS_BUILD_TESTING=ON                                                                   ^
+-DKRATOS_BUILD_TESTING=OFF                                                                  ^
 -DHDF5_ROOT="c:\hdf5\bin"                                                                   ^
 -DMED_ROOT="c:\med\bin"                                                                     ^
 -DKRATOS_GENERATE_PYTHON_STUBS=ON