Skip to content

Commit 7653f67

Browse files
committed
adding SuiteSpare, camp, and JSON-Fortran to gitmodules; first steps toward camp support in CMakeLists
1 parent 90db128 commit 7653f67

File tree

5 files changed

+35
-0
lines changed

5 files changed

+35
-0
lines changed

.gitmodules

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,15 @@
2626
path = gitmodules/string_view-standalone
2727
url = https://github.com/bitwizeshift/string_view-standalone.git
2828
shallow = true
29+
[submodule "gitmodules/camp"]
30+
path = gitmodules/camp
31+
url = https://github.com/zdaq12/camp
32+
shallow = true
33+
[submodule "gitmodules/SuiteSparse"]
34+
path = gitmodules/SuiteSparse
35+
url = https://github.com/DrTimothyAldenDavis/SuiteSparse
36+
shallow = true
37+
[submodule "gitmodules/json-fortran"]
38+
path = gitmodules/json-fortran
39+
url = https://github.com/jacobwilliams/json-fortran
40+
shallow = true

CMakeLists.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
1515

1616
if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
1717
add_compile_options($<$<COMPILE_LANGUAGE:Fortran>:-fimplicit-none>)
18+
add_compile_options($<$<COMPILE_LANGUAGE:Fortran>:-ffixed-line-length-none>)
1819
endif()
1920

2021
macro(add_prefix prefix rootlist)
@@ -34,6 +35,23 @@ set(PyPartMC_sources
3435
)
3536
add_prefix(src/ PyPartMC_sources)
3637

38+
set(camp_sources
39+
util.F90 constants.F90 mpi.F90
40+
env_state.F90
41+
rand.F90
42+
property.F90 chem_spec_data.F90
43+
rxn_data.F90 camp_state.F90 mechanism_data.F90
44+
camp_core.F90 camp_solver_data.F90 aero_rep_data.F90
45+
aero_phase_data.F90 aero_rep_factory.F90
46+
rxn_factory.F90 sub_model_data.F90 sub_model_factory.F90
47+
solver_stats.F90
48+
debug_diff_check.F90 aero_reps/aero_rep_modal_binned_mass.F90
49+
aero_reps/aero_rep_single_particle.F90
50+
aero_reps/aero_rep_modal_binned_mass.c
51+
aero_reps/aero_rep_single_particle.c
52+
)
53+
add_prefix(gitmodules/camp/src/ camp_sources)
54+
3755
set(partmclib_SOURCES condense_solver.c aero_state.F90 integer_varray.F90 integer_rmap.F90
3856
integer_rmap2.F90 aero_sorted.F90 aero_binned.F90 bin_grid.F90 constants.F90 scenario.F90
3957
env_state.F90 aero_mode.F90 aero_dist.F90 aero_weight.F90 aero_weight_array.F90
@@ -47,6 +65,7 @@ set(partmclib_SOURCES condense_solver.c aero_state.F90 integer_varray.F90 intege
4765
)
4866
add_prefix(gitmodules/partmc/src/ partmclib_SOURCES)
4967
list(APPEND partmclib_SOURCES src/fake_mpi.F90 src/fake_netcdf.F90 src/fake_spec_file.F90)
68+
list(APPEND partmclib_SOURCES ${camp_sources})
5069

5170
### SUNDIALS #######################################################################################
5271

@@ -111,6 +130,7 @@ add_prefix(sundials_ SUNDIALS_items)
111130
add_library(partmclib STATIC ${partmclib_SOURCES})
112131
target_compile_definitions(partmclib PRIVATE PMC_USE_SUNDIALS="1")
113132
target_compile_definitions(partmclib PRIVATE PMC_USE_MPI="1")
133+
target_compile_definitions(partmclib PRIVATE PMC_USE_CAMP="1")
114134
add_dependencies(partmclib ${SUNDIALS_items})
115135
target_include_directories(partmclib PRIVATE ${SUNDIALS_SOURCE_DIR}/include)
116136
target_include_directories(partmclib PRIVATE ${CMAKE_BINARY_DIR}/include)

gitmodules/SuiteSparse

Submodule SuiteSparse added at 05b25d3

gitmodules/camp

Submodule camp added at 5f33af6

gitmodules/json-fortran

Submodule json-fortran added at 280ae0e

0 commit comments

Comments
 (0)