Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -578,10 +578,20 @@ endif()
foreach(target _PyPartMC)
target_compile_options(${target} PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
# $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-unused-parameter>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-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)
Expand Down
1 change: 0 additions & 1 deletion src/aero_particle.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
1 change: 1 addition & 0 deletions src/run_part.F90
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/run_part_opt.F90
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
!###################################################################################################

module PyPartMC_run_part_opt
! TODO #482
use pmc_run_part
use pmc_spec_file
use pmc_output
Expand Down
Loading