Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
473495d
Adding evaluator for pipe drainage network
Nov 22, 2022
58f7a6a
Working on pipe drain evaluator
Nov 22, 2022
cdd8167
Worked on pipe drain evaluator
Nov 29, 2022
6fc5140
Cleaned up code and added partial derivative
Nov 30, 2022
7d37625
Commented out variables not needed at the moment
Dec 1, 2022
3d20526
Added support for shallow water pk
dasvyat Dec 15, 2022
e248f68
Fixed gravity in pipe drain evaluator
May 5, 2023
022009b
Modified pipe_drain_evaluator.cc
May 30, 2023
cafe232
Modified pipe drain evaluator
Jun 12, 2023
5e6e6e0
Had to modify a dependency of the pipe drain eval
Jun 12, 2023
f8a26a5
Fixed a silly typo
Jun 12, 2023
8ba1483
Modified pipe drain evaluator
Jun 15, 2023
ac856b5
Modified energy loss coefficients for pipe drain
Aug 24, 2023
29b976f
Changed def of g in pipe drain evaluator
Sep 21, 2023
bb1c4e6
Fixed typo
Sep 21, 2023
8baa654
Brought ats-regressions-tests repo up to speed
Nov 21, 2023
00c2a7a
WIP: SW + pipe coupling pipe drain different domains
Jan 5, 2024
4f32fbd
pipe drain evaluator changes from Daniil's branch
Jan 10, 2024
3fff78c
WIP: first results on one sided coupling from SW->pipe
Jan 10, 2024
abf1998
WIP: slight update; SW evaluator still not working but pipe evaluator…
Jan 11, 2024
870cab7
WIP: prototype example of two way SW <-> pipe drain coupling working …
Jan 11, 2024
0c47632
WIP: first results two way coupling SW<->pipe with MULTIPLE manholes
Jan 16, 2024
47d8348
WIP: SW<->pipe for multiple manholes
Jan 17, 2024
f8e6526
WIP: bug fix
Jan 17, 2024
d8bef46
WIP: new map implementation for SW<->pipe domain; first physically so…
Jan 17, 2024
f5ef000
code clean up
Jan 18, 2024
4fdd6fb
Code clean up and slight changes
Jan 23, 2024
52997f3
WIP: upding drain length based on bathymetry
Jan 29, 2024
47edca3
Pipe drain length bathymetry dependence implemented
Jan 29, 2024
53edeb0
minor changes to address consistency comments
Feb 7, 2024
8ed67b9
updated EvaluatePartialDerivative_
Feb 7, 2024
58f3a84
Merge pull request #230 from amanzi/naren/giacomo_urban_storm_drains
gcapodag Feb 8, 2024
4d34cf9
Uopdated testing/ats-regressions-tests
Feb 8, 2024
68e453d
First results on using different meshes for manhole coupling WITHOUT …
Feb 24, 2024
fd3193a
Slight clean up
nvohra0016 Feb 25, 2024
7f4e507
Merge pull request #240 from amanzi/naren/giacomo_urban_storm_drains
gcapodag Mar 1, 2024
4ffb397
Initialized pipe_map_created_ and sw_map_created_
Mar 2, 2024
ef1a0da
Modified a small thing in pipe_drain_evaluator.cc
Mar 6, 2024
2eead27
Merge branch 'master' into merge_w_master_giacomo/urban_storm_drains
Mar 14, 2024
1fb6561
Fixes to comply with master
Mar 14, 2024
630834f
Making changes to comply with master
Mar 14, 2024
1b3f36e
Making changes to comply with master
Mar 14, 2024
fa7e35d
Making changes to comply with master
Mar 14, 2024
1b0a86b
Making changes to comply with master
Mar 14, 2024
0a3ccbe
Making changes to comply with master
Mar 14, 2024
d172be9
Testing something
Mar 14, 2024
304ab1e
Reverted test
Mar 14, 2024
a08004c
Added PKs dir linking in CMakeList
Mar 15, 2024
c19fcee
Added PKS_SOURCE_DIR to CMakeList
Mar 15, 2024
c148530
Testing
Mar 15, 2024
a2c9e47
testing
Mar 15, 2024
b5d4f24
testing
Mar 15, 2024
5ee3921
testing
Mar 15, 2024
32d981a
testing
Mar 15, 2024
b93c775
Finally the linking is OK
Mar 15, 2024
854c009
Let's see this time
Mar 15, 2024
80b4877
Now
Mar 16, 2024
1c60f2e
Now
Mar 16, 2024
4ce88e5
Now
Mar 16, 2024
8d02cf7
ATS builds
Mar 16, 2024
447181e
modified reading of keys in pipe_drain_evaluator.cc
dasvyat Mar 20, 2024
d853874
Merge branch 'giacomo/urban_storm_drains' into merge_w_master_giacomo…
dasvyat Mar 20, 2024
1d1e208
Merge branch 'master' of github.com:amanzi/ats into merge_w_master_gi…
Apr 2, 2024
8672778
Merge branch 'merge_w_master_giacomo/urban_storm_drains' of github.co…
Apr 2, 2024
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
2 changes: 2 additions & 0 deletions src/executables/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ include_directories(${DBG_SOURCE_DIR})
include_directories(${TRANSPORT_SOURCE_DIR})
get_property(CHEM_INCLUDES_DIR GLOBAL PROPERTY CHEM_INCLUDES_DIR)
include_directories(${CHEM_INCLUDES_DIR})
include_directories(${SHALLOW_WATER_SOURCE_DIR})

include_directories(${ATS_SOURCE_DIR}/src/constitutive_relations)
include_directories(${ATS_SOURCE_DIR}/src/constitutive_relations/eos)
Expand Down Expand Up @@ -97,6 +98,7 @@ set(amanzi_link_libs
mesh_logical
chemistry_pk
#mpc_tree
shallow_water
transport
)

Expand Down
1 change: 1 addition & 0 deletions src/executables/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

// registration files
#include "ats_registration_files.hh"
#include "pks_shallow_water_registration.hh"

int
main(int argc, char* argv[])
Expand Down
8 changes: 3 additions & 5 deletions src/pks/flow/constitutive_relations/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,18 @@


# collect all sources

list(APPEND subdirs elevation overland_conductivity porosity sources water_content wrm)

list(APPEND subdirs elevation overland_conductivity porosity water_content wrm sources)
set(ats_flow_relations_src_files "")
set(ats_flow_relations_inc_files "")

foreach(lcv IN LISTS subdirs)
include_directories(${ATS_SOURCE_DIR}/src/pks/flow/constitutive_relations/${lcv})

file(GLOB subdir_sources "./${lcv}/*.cc")
set(ats_flow_relations_src_files ${ats_flow_relations_src_files} ${subdir_sources})
set(ats_flow_relations_src_files ${ats_flow_relations_src_files} ${subdir_sources})

file(GLOB subdir_incs "./${lcv}/*.hh")
set(ats_flow_relations_inc_files ${ats_flow_relations_inc_files} ${subdir_incs})
set(ats_flow_relations_inc_files ${ats_flow_relations_inc_files} ${subdir_incs})

file(GLOB registrations "./${lcv}/*_reg.hh" )
foreach(reg_lcv IN LISTS registrations)
Expand Down
Loading