-
-
Notifications
You must be signed in to change notification settings - Fork 109
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add DuMuX as a participant to the two-scale-heat-conduction tutorial (#…
…376) * port two-scale-heat-conduction case with DuMuX-DuMuX * Initial folder restructuring for setting up a DUNE modules environment and running the DuMuX-DuMuX case * Removing unnecessary CMake files * [two-scale-heat-conduction] add dune module wrapper * [two-scale-heat-conduction] macro-dumux as dune module * [two-scale-heat-conduction] update macro-dumux to preCICE 3.0 and DuMux 3.8 * [two-scale-heat-conduction] remove dumux subdirectory * Remove dune-wrapper folder and restructure macro-dumux * [two-scale-heat-conduction] revert setup script to rebuild modules in working directory * [two-scale-heat-conduction][tmp] change branch in dumux-adapter * [two-scale-heat-conduction] fix macro participant * Construct mesh name macro-mesh of 10 characters * [two-scale-heat-conduction] fixes macro-dumux * Formatting * Formatting and use string literals * PEP8 formatting * Go back to cloning the develop branch of dumux-adapter in setup-dumux.sh * Formatting * Remove dumux-dumux because all the code in it is now ported * Add appropriate run scripts * Adding correct cleaning scripts and cleaning functions * Remove unnecessary cleaning script * Remove all references to clean-example.sh * [two-scale-heat-conduction] update micro-dumux for DuMux 3.7 * restructured micro-dumux, added run.sh for macro-dumux * repair communication of concentration * add shebang for cleaning script * customize cleaning file in micro-dumux * modify cleaning file to delete log file * add dumux-dumux method in README * Make the execution level of Nutils and DuMuX participants consistent * Add DuMuX information to README * Minor edit in README * Add cleaning script to micro-dumux and add DuMuX cleaning in the tools * add image of results for dumux-dumux simulation * Add information on which participants can be run in parallel * Fix linting docs * image modified * image resized * [two-scale-heat-conduction] cleanup * [two-scale-heat-conduction] add compile-dumux-cases.sh * Swapping maintainers of macro-dumux and micro-dumux --------- Co-authored-by: Jun Chen <[email protected]> Co-authored-by: Ishaan Desai <[email protected]> Co-authored-by: Mathis Kelm <[email protected]>
- Loading branch information
1 parent
edd58e0
commit b1e74d7
Showing
46 changed files
with
3,385 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
dumux/ | ||
dumux-phasefield/ | ||
dumux-adapter/ | ||
dune-* | ||
*/build-cmake/ | ||
install* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
#!/bin/sh | ||
set -e -u | ||
|
||
cd macro-dumux/build-cmake/appl | ||
make macro_dumux | ||
cd ../../../micro-dumux/build-cmake/appl | ||
make | ||
cd ../../../ | ||
|
||
# Move macro-dumux and micro-dumux executables to the participant folder level | ||
mv macro-dumux/build-cmake/appl/macro_dumux macro-dumux/ | ||
mv micro-dumux/build-cmake/appl/micro_sim.cpython-310-x86_64-linux-gnu.so micro-dumux/ |
Binary file added
BIN
+68.4 KB
...le-heat-conduction/images/tutorials-two-scale-heat-conduction-results-du-du.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
cmake_minimum_required(VERSION 3.13) | ||
project(macro-dumux CXX) | ||
|
||
if(NOT (dune-common_DIR OR dune-common_ROOT OR | ||
"${CMAKE_PREFIX_PATH}" MATCHES ".*dune-common.*")) | ||
string(REPLACE ${PROJECT_NAME} dune-common dune-common_DIR | ||
${PROJECT_BINARY_DIR}) | ||
endif() | ||
|
||
#find dune-common and set the module path | ||
find_package(dune-common REQUIRED) | ||
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules" | ||
${dune-common_MODULE_PATH}) | ||
|
||
#include the dune macros | ||
include(DuneMacros) | ||
|
||
# start a dune project with information from dune.module | ||
dune_project() | ||
|
||
dune_enable_all_packages() | ||
|
||
add_subdirectory(doc) | ||
add_subdirectory(cmake/modules) | ||
add_subdirectory(appl) | ||
|
||
# finalize the dune project, e.g. generating config.h etc. | ||
finalize_dune_project(GENERATE_CONFIG_H_CMAKE) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
add_executable(macro_dumux main.cc) | ||
target_compile_definitions(macro_dumux PUBLIC "ENABLEMONOLITHIC=0") | ||
target_link_libraries(macro_dumux PRIVATE dumux-precice) | ||
target_compile_definitions(macro_dumux PUBLIC TYPETAG=OnePNIConductionCCTpfa) | ||
|
||
# add a symlink for each input file | ||
add_input_file_links() |
Oops, something went wrong.