diff --git a/CMakeLists.txt b/CMakeLists.txt index 50fd4c7b..d6282368 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -578,10 +578,20 @@ 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() + +# TODO #482 +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) diff --git a/gitmodules/nanobind_json b/gitmodules/nanobind_json index cb8a8565..7223ee80 160000 --- a/gitmodules/nanobind_json +++ b/gitmodules/nanobind_json @@ -1 +1 @@ -Subproject commit cb8a8565cc3bc7510b448cea6e6ec9cff98a599b +Subproject commit 7223ee80cc68701821f35fd8916fae61ebe065b3 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); } 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