Skip to content

Commit 56085b6

Browse files
CusiniMfrankfeifanjkgollarrsettgast
authored
refactor: refactor hpcReact to generalize behavior and introduce solid species and surface complexation. (#5)
* feat: add mixed system. * Implement mixed ultramafic system with serpentinization rxn * fix order of constexpr host device * mixed reactions test working. * refactor all unitTests. * add predefined variant for geochem. * add benchmark system. * Add Forge system --------- Co-authored-by: frankfeifan <[email protected]> Co-authored-by: jkgolla <[email protected]> Co-authored-by: Randolph Settgast <[email protected]>
1 parent fd1a3a7 commit 56085b6

34 files changed

+1705
-1120
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
build*
22
install*
33
cmake/blt*
4-
.vscode*
4+
.vscode*
5+
.DS_Store
6+
src/.DS_Store

src/CMakeLists.txt

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,23 @@
22
set( hpcReact_headers
33
common/macros.hpp
44
common/CArrayWrapper.hpp
5-
reactions/bulkGeneric/EquilibriumReactions.hpp
6-
reactions/bulkGeneric/EquilibriumReactionsAggregatePrimaryConcentration_impl.hpp
7-
reactions/bulkGeneric/EquilibriumReactionsReactionExtents_impl.hpp
8-
reactions/bulkGeneric/KineticReactions.hpp
9-
reactions/bulkGeneric/KineticReactions_impl.hpp
10-
reactions/bulkGeneric/MixedEquilibriumKineticReactions.hpp
11-
reactions/bulkGeneric/MixedEquilibriumKineticReactions_impl.hpp
12-
reactions/bulkGeneric/Parameters.hpp
13-
reactions/bulkGeneric/ParametersPredefined.hpp
14-
reactions/bulkGeneric/SpeciesUtilities.hpp
5+
reactions/exampleSystems/BulkGeneric.hpp
6+
reactions/geochemistry/Carbonate.hpp
7+
reactions/geochemistry/Forge.hpp
8+
reactions/geochemistry/GeochemicalSystems.hpp
9+
reactions/geochemistry/Ultramafics.hpp
10+
reactions/massActions/MassActions.hpp
11+
reactions/reactionsSystems/EquilibriumReactions.hpp
12+
reactions/reactionsSystems/EquilibriumReactionsAggregatePrimaryConcentration_impl.hpp
13+
reactions/reactionsSystems/EquilibriumReactionsReactionExtents_impl.hpp
14+
reactions/reactionsSystems/KineticReactions.hpp
15+
reactions/reactionsSystems/KineticReactions_impl.hpp
16+
reactions/reactionsSystems/MixedEquilibriumKineticReactions.hpp
17+
reactions/reactionsSystems/MixedEquilibriumKineticReactions_impl.hpp
18+
reactions/reactionsSystems/Parameters.hpp
19+
reactions/unitTestUtilities/equilibriumReactionsTestUtilities.hpp
20+
reactions/unitTestUtilities/kineticReactionsTestUtilities.hpp
21+
reactions/unitTestUtilities/mixedReactionsTestUtilities.hpp
1522
)
1623

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

62-
add_subdirectory( reactions/bulkGeneric/unitTests )
69+
add_subdirectory( reactions/exampleSystems/unitTests )
70+
add_subdirectory( reactions/geochemistry/unitTests )
71+
add_subdirectory( reactions/massActions/unitTests )
6372
add_subdirectory( common/unitTests )
6473
add_subdirectory( docs )
6574

src/common/printers.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#pragma once
22

33
#include <stdio.h>
4+
#include "CArrayWrapper.hpp"
45

56
template< typename T, int N >
67
void print( T const (&a)[N], char const * name, int const numDigits )

src/reactions/bulkGeneric/unitTests/testEquilibriumReactions.cpp

Lines changed: 0 additions & 276 deletions
This file was deleted.

0 commit comments

Comments
 (0)