From cd0ef8a6b79d68f9e3179ac4200f201957665ded Mon Sep 17 00:00:00 2001 From: yisangriB Date: Mon, 9 Sep 2024 18:19:51 -0700 Subject: [PATCH 1/5] sy - fixing a bug in surrogate prediction --- modules/performFEM/surrogateGP/gpPredict.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/performFEM/surrogateGP/gpPredict.py b/modules/performFEM/surrogateGP/gpPredict.py index 5582a5414..1d6ff956c 100644 --- a/modules/performFEM/surrogateGP/gpPredict.py +++ b/modules/performFEM/surrogateGP/gpPredict.py @@ -324,7 +324,7 @@ def get_stochastic_variance(X, Y, x, ny): # noqa: N803 not name_values[1] .replace('.', '', 1) .replace('e', '', 1) - .replace('-', '', 1) + .replace('-', '', 2) .replace('+', '', 1) .isdigit() ): From 65ea00d3d9d2a885553e08ea11d192a950804b97 Mon Sep 17 00:00:00 2001 From: yisangriB Date: Tue, 17 Sep 2024 18:39:29 -0700 Subject: [PATCH 2/5] sy - important update to smelt cmake --- modules/performUQ/SimCenterUQ/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/performUQ/SimCenterUQ/CMakeLists.txt b/modules/performUQ/SimCenterUQ/CMakeLists.txt index 48fa82a5b..358729cb7 100644 --- a/modules/performUQ/SimCenterUQ/CMakeLists.txt +++ b/modules/performUQ/SimCenterUQ/CMakeLists.txt @@ -3,4 +3,4 @@ simcenter_add_python_script(SCRIPT surrogateBuild.py) simcenter_add_python_script(SCRIPT UQengine.py) simcenter_add_python_script(SCRIPT runPLoM.py) add_subdirectory(PLoM) -#add_subdirectory(nataf_gsa) +add_subdirectory(nataf_gsa) From c563f23904c262f3f12af6c54e194f0af023bc1d Mon Sep 17 00:00:00 2001 From: yisangriB Date: Tue, 17 Sep 2024 18:42:04 -0700 Subject: [PATCH 3/5] sy - important update to smelt cmake --- modules/createEVENT/stochasticGroundMotion/CMakeLists.txt | 6 ++++-- modules/createEVENT/stochasticWind/CMakeLists.txt | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/createEVENT/stochasticGroundMotion/CMakeLists.txt b/modules/createEVENT/stochasticGroundMotion/CMakeLists.txt index e202d83d2..19365cb5a 100644 --- a/modules/createEVENT/stochasticGroundMotion/CMakeLists.txt +++ b/modules/createEVENT/stochasticGroundMotion/CMakeLists.txt @@ -1,5 +1,5 @@ -#simcenter_add_executable(NAME StochasticGM -# DEPENDS CONAN_PKG::kissfft smelt) +#simcenter_add_executable(StochasticGM +# command_parser.cpp eq_generator.cpp main.cpp) add_executable(StochasticGM command_parser.cpp eq_generator.cpp main.cpp) @@ -7,3 +7,5 @@ include_directories(../common/smelt) target_link_libraries (StochasticGM CONAN_PKG::kissfft smelt) set_property(TARGET StochasticGM PROPERTY CXX_STANDARD 17) + +install(TARGETS StochasticGM DESTINATION ${PROJECT_SOURCE_DIR}/applications/createEVENT/stochasticGroundMotion) \ No newline at end of file diff --git a/modules/createEVENT/stochasticWind/CMakeLists.txt b/modules/createEVENT/stochasticWind/CMakeLists.txt index 84ea60221..b906b88a8 100644 --- a/modules/createEVENT/stochasticWind/CMakeLists.txt +++ b/modules/createEVENT/stochasticWind/CMakeLists.txt @@ -8,3 +8,5 @@ target_link_libraries (StochasticWind CONAN_PKG::kissfft smelt common) set_property(TARGET StochasticWind PROPERTY CXX_STANDARD 17) + +install(TARGETS StochasticWind DESTINATION ${PROJECT_SOURCE_DIR}/applications/createEVENT/stochasticWind) \ No newline at end of file From 7186747e68aeafa4e2af1745b7f1f215216214af Mon Sep 17 00:00:00 2001 From: yisangriB Date: Tue, 17 Sep 2024 18:42:21 -0700 Subject: [PATCH 4/5] sy - undo uncomment --- modules/performUQ/SimCenterUQ/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/performUQ/SimCenterUQ/CMakeLists.txt b/modules/performUQ/SimCenterUQ/CMakeLists.txt index 358729cb7..48fa82a5b 100644 --- a/modules/performUQ/SimCenterUQ/CMakeLists.txt +++ b/modules/performUQ/SimCenterUQ/CMakeLists.txt @@ -3,4 +3,4 @@ simcenter_add_python_script(SCRIPT surrogateBuild.py) simcenter_add_python_script(SCRIPT UQengine.py) simcenter_add_python_script(SCRIPT runPLoM.py) add_subdirectory(PLoM) -add_subdirectory(nataf_gsa) +#add_subdirectory(nataf_gsa) From d3c350b1f1524f88b3cb1df700fbb5284adaa3d9 Mon Sep 17 00:00:00 2001 From: yisangriB Date: Tue, 17 Sep 2024 18:45:05 -0700 Subject: [PATCH 5/5] sy - undo unnecessary change --- modules/createEVENT/stochasticGroundMotion/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/createEVENT/stochasticGroundMotion/CMakeLists.txt b/modules/createEVENT/stochasticGroundMotion/CMakeLists.txt index 19365cb5a..114572521 100644 --- a/modules/createEVENT/stochasticGroundMotion/CMakeLists.txt +++ b/modules/createEVENT/stochasticGroundMotion/CMakeLists.txt @@ -1,5 +1,5 @@ -#simcenter_add_executable(StochasticGM -# command_parser.cpp eq_generator.cpp main.cpp) +#simcenter_add_executable(NAME StochasticGM +# DEPENDS CONAN_PKG::kissfft smelt) add_executable(StochasticGM command_parser.cpp eq_generator.cpp main.cpp)