Skip to content
Merged
Show file tree
Hide file tree
Changes from 41 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
33390bc
feat: add as a geos submodule.
CusiniM Apr 2, 2025
47aadc3
make a typa alias so they can be directly used in ReactiveSinglePhase…
frankfeifan Apr 24, 2025
85fecab
feat: add mixed system.
CusiniM May 6, 2025
a5bdc93
mixed system functions completed.
CusiniM May 14, 2025
9581b6a
working on testing mixed system.
CusiniM May 17, 2025
c320232
add MixedEquilibriumKineticReactions_impl.hpp
CusiniM May 17, 2025
b4ec76c
Everything compiles again.
CusiniM May 19, 2025
e82f1fc
unitTests are passing.
CusiniM May 19, 2025
cfe8287
add constexpr.
CusiniM May 19, 2025
696957a
add std:: to size_t
CusiniM May 20, 2025
fbccdf2
fix some variables names and inputs.
CusiniM May 21, 2025
0a2b5dc
Implement mixed ultramafic system with serpentinization rxn
jkgolla May 22, 2025
bd47423
fix order of constexpr host device
rrsettgast May 23, 2025
f85dac1
temporarily change the typename and turned off the ultramafic to pass…
frankfeifan May 28, 2025
71bde44
corrected a few indices in the loop to match the order in ParametersP…
frankfeifan May 28, 2025
1bf79e1
Merge remote-tracking branch 'origin/cusini/mixed-reactions' into cus…
frankfeifan May 28, 2025
5b7584c
fix ultramafics
CusiniM May 29, 2025
462beae
forgotten comma
CusiniM May 29, 2025
8dbbaac
wip: add mixedReactions unit test.
CusiniM Jun 2, 2025
76fceb7
mixed reactions test working.
CusiniM Jun 3, 2025
56211c5
added pmpl
CusiniM Jun 3, 2025
8f7e7ae
add if constexpr for cases with no kinetics.
CusiniM Jun 3, 2025
6c6838e
initial commit: solid surface Area and surface reactions.
CusiniM Jun 13, 2025
ee66f3e
refactor
CusiniM Jun 17, 2025
a5b9c61
refactor all unitTests.
CusiniM Jun 17, 2025
b93ac1e
add predefined variant for geochem.
CusiniM Jun 17, 2025
7ea3913
fix mass actions.
CusiniM Jun 17, 2025
220b4f0
fix shadowing error.
CusiniM Jun 18, 2025
01e1827
again, new name.
CusiniM Jun 18, 2025
6605ef6
Doxygen
CusiniM Jun 18, 2025
f0e99f8
Merge remote-tracking branch 'origin/cusini/mixed-reactions' into cus…
CusiniM Jun 18, 2025
162e220
one more doxygen error.
CusiniM Jun 18, 2025
10bd0ad
Merge remote-tracking branch 'origin/cusini/mixed-reactions' into cus…
CusiniM Jun 18, 2025
dc9325d
fix surfaceArea interface
CusiniM Jun 19, 2025
ec9cbd9
Merge remote-tracking branch 'origin/main' into cusini/solid-phase-su…
CusiniM Jun 19, 2025
fe0cdf9
wip: add surfaceArea to test.
CusiniM Jun 19, 2025
3ec1ed8
refactor
CusiniM Jun 19, 2025
a4384a6
add benchmark system.
CusiniM Jun 19, 2025
e901104
geochme system seems to work.
CusiniM Jun 19, 2025
d0d3834
Add Forge system
CusiniM Jun 24, 2025
9e36edd
add comment
CusiniM Jun 24, 2025
7ba2edb
add variant header
rrsettgast Jun 25, 2025
5ea2a5b
updated unit tests
rrsettgast Jun 25, 2025
fed4292
add doxygen
rrsettgast Jun 25, 2025
115dbf1
uncrustify
rrsettgast Jun 25, 2025
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
31 changes: 20 additions & 11 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,23 @@
set( hpcReact_headers
common/macros.hpp
common/CArrayWrapper.hpp
reactions/bulkGeneric/EquilibriumReactions.hpp
reactions/bulkGeneric/EquilibriumReactionsAggregatePrimaryConcentration_impl.hpp
reactions/bulkGeneric/EquilibriumReactionsReactionExtents_impl.hpp
reactions/bulkGeneric/KineticReactions.hpp
reactions/bulkGeneric/KineticReactions_impl.hpp
reactions/bulkGeneric/MixedEquilibriumKineticReactions.hpp
reactions/bulkGeneric/MixedEquilibriumKineticReactions_impl.hpp
reactions/bulkGeneric/Parameters.hpp
reactions/bulkGeneric/ParametersPredefined.hpp
reactions/bulkGeneric/SpeciesUtilities.hpp
reactions/exampleSystems/BulkGeneric.hpp
reactions/geochemistry/Carbonate.hpp
reactions/geochemistry/Forge.hpp
reactions/geochemistry/GeochemicalSystems.hpp
reactions/geochemistry/Ultramafics.hpp
reactions/massActions/MassActions.hpp
reactions/reactionsSystems/EquilibriumReactions.hpp
reactions/reactionsSystems/EquilibriumReactionsAggregatePrimaryConcentration_impl.hpp
reactions/reactionsSystems/EquilibriumReactionsReactionExtents_impl.hpp
reactions/reactionsSystems/KineticReactions.hpp
reactions/reactionsSystems/KineticReactions_impl.hpp
reactions/reactionsSystems/MixedEquilibriumKineticReactions.hpp
reactions/reactionsSystems/MixedEquilibriumKineticReactions_impl.hpp
reactions/reactionsSystems/Parameters.hpp
reactions/unitTestUtilities/equilibriumReactionsTestUtilities.hpp
reactions/unitTestUtilities/kineticReactionsTestUtilities.hpp
reactions/unitTestUtilities/mixedReactionsTestUtilities.hpp
)

set( hpcReact_sources)
Expand Down Expand Up @@ -59,7 +66,9 @@ message(STATUS "HPCReact/src CMAKE_CURRENT_SOURCE_DIR: ${CMAKE_CURRENT_SOURCE_DI
# hpcReact_add_code_checks( PREFIX hpcReact
# EXCLUDES "blt/*" )

add_subdirectory( reactions/bulkGeneric/unitTests )
add_subdirectory( reactions/exampleSystems/unitTests )
add_subdirectory( reactions/geochemistry/unitTests )
add_subdirectory( reactions/massActions/unitTests )
add_subdirectory( common/unitTests )
add_subdirectory( docs )

Expand Down
1 change: 1 addition & 0 deletions src/common/printers.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <stdio.h>
#include "CArrayWrapper.hpp"

template< typename T, int N >
void print( T const (&a)[N], char const * name, int const numDigits )
Expand Down
214 changes: 0 additions & 214 deletions src/reactions/bulkGeneric/MixedEquilibriumKineticReactions_impl.hpp

This file was deleted.

Loading
Loading