From 25782e9689a53b8924ab20e9bf850605463bb277 Mon Sep 17 00:00:00 2001 From: Griger5 Date: Tue, 13 Jan 2026 15:44:32 +0100 Subject: [PATCH 1/6] reenable Werror and other flags --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 50fd4c7b..3bac7bfd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -578,8 +578,7 @@ endif() foreach(target _PyPartMC) target_compile_options(${target} PRIVATE $<$:/W4 /WX> - # $<$>:-Wall -Wextra -Wpedantic -Werror> - $<$>:-Wno-unused-parameter> + $<$>:-Wall -Wextra -Wpedantic -Werror -Wno-unused-parameter> ) endforeach() target_compile_definitions(_PyPartMC PRIVATE PMC_USE_SUNDIALS="1") From aac04ea39d297f8dc673e572ba2a2a29c4845476 Mon Sep 17 00:00:00 2001 From: Griger5 Date: Mon, 2 Mar 2026 13:32:26 +0100 Subject: [PATCH 2/6] bump nanobidnd_json submodule version --- gitmodules/nanobind | 2 +- gitmodules/nanobind_json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitmodules/nanobind b/gitmodules/nanobind index d4b245ad..7d13bfc2 160000 --- a/gitmodules/nanobind +++ b/gitmodules/nanobind @@ -1 +1 @@ -Subproject commit d4b245ad69f729c3d2095be4c1cb5b94810dae26 +Subproject commit 7d13bfc2581b9a34be2f3ab32c035fd182ffe407 diff --git a/gitmodules/nanobind_json b/gitmodules/nanobind_json index cb8a8565..58c78e5d 160000 --- a/gitmodules/nanobind_json +++ b/gitmodules/nanobind_json @@ -1 +1 @@ -Subproject commit cb8a8565cc3bc7510b448cea6e6ec9cff98a599b +Subproject commit 58c78e5d4e5cf9981817c611c803af352cf2bef6 From fe5591a417dfeff19e30cb7ed698f89f84cf597b Mon Sep 17 00:00:00 2001 From: Griger5 Date: Tue, 3 Mar 2026 11:48:22 +0100 Subject: [PATCH 3/6] fix: remove unused variable --- src/aero_particle.hpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/aero_particle.hpp b/src/aero_particle.hpp index de47ca74..ca14e502 100644 --- a/src/aero_particle.hpp +++ b/src/aero_particle.hpp @@ -72,7 +72,6 @@ struct AeroParticle { { int len = AeroData::__len__(*self.aero_data); auto fn = f_aero_particle_volumes; - auto aero_data_ptr = self.aero_data->ptr.f_arg(); return pypartmc::get_array_values_set_len(self, fn, len); } From 48e01ae167ba1c791d960f5e4ef879dd0ee52653 Mon Sep 17 00:00:00 2001 From: Griger5 Date: Sat, 7 Mar 2026 15:34:29 +0100 Subject: [PATCH 4/6] disable Werror for run_part_opt and run_part --- CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3bac7bfd..c2fb6f6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -581,6 +581,16 @@ foreach(target _PyPartMC) $<$>:-Wall -Wextra -Wpedantic -Werror -Wno-unused-parameter> ) endforeach() + +set_source_files_properties( + src/run_part_opt.F90 + PROPERTIES COMPILE_OPTIONS "-Wno-error" +) +set_source_files_properties( + src/run_part.F90 + PROPERTIES COMPILE_OPTIONS "-Wno-error" +) + target_compile_definitions(_PyPartMC PRIVATE PMC_USE_SUNDIALS="1") include(CheckCXXSourceCompiles) file(GLOB PyPartMC_headers ${CMAKE_SOURCE_DIR}/src/*.hpp) From 31879de3ef8b831987a9033280afb440de228386 Mon Sep 17 00:00:00 2001 From: Griger5 Date: Sun, 8 Mar 2026 13:41:56 +0100 Subject: [PATCH 5/6] add: mark todos --- CMakeLists.txt | 1 + src/run_part.F90 | 1 + src/run_part_opt.F90 | 1 + 3 files changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c2fb6f6a..d6282368 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -582,6 +582,7 @@ foreach(target _PyPartMC) ) endforeach() +# TODO #482 set_source_files_properties( src/run_part_opt.F90 PROPERTIES COMPILE_OPTIONS "-Wno-error" diff --git a/src/run_part.F90 b/src/run_part.F90 index aaae1e71..8b62a2d4 100644 --- a/src/run_part.F90 +++ b/src/run_part.F90 @@ -7,6 +7,7 @@ module PyPartMC_run_part use iso_c_binding + ! TODO #482 use pmc_run_part use camp_camp_core use pmc_photolysis diff --git a/src/run_part_opt.F90 b/src/run_part_opt.F90 index 15cb78ff..3a43187c 100644 --- a/src/run_part_opt.F90 +++ b/src/run_part_opt.F90 @@ -5,6 +5,7 @@ !################################################################################################### module PyPartMC_run_part_opt + ! TODO #482 use pmc_run_part use pmc_spec_file use pmc_output From 92e65aa2aab62c2f77283a970ee5392d4cf8ef04 Mon Sep 17 00:00:00 2001 From: Griger5 Date: Sun, 8 Mar 2026 20:15:50 +0100 Subject: [PATCH 6/6] bump nanobind_json version --- gitmodules/nanobind_json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitmodules/nanobind_json b/gitmodules/nanobind_json index 58c78e5d..7223ee80 160000 --- a/gitmodules/nanobind_json +++ b/gitmodules/nanobind_json @@ -1 +1 @@ -Subproject commit 58c78e5d4e5cf9981817c611c803af352cf2bef6 +Subproject commit 7223ee80cc68701821f35fd8916fae61ebe065b3