max/tug
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/tug.git synced 2025-12-15 18:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hannes-philipp' into 'csv-to-eigen'

Browse Source 
# Conflicts:
#   src/Simulation.cpp
This commit is contained in:
Philipp Ungrund 2023-08-03 09:23:09 +00:00
commit ba7a38f72f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/tug/Simulation.hpp
View File

@ -17,7 +17,7 @@ enum CSV_OUTPUT {
enum CONSOLE_OUTPUT { enum CONSOLE_OUTPUT {
CONSOLE_OUTPUT_OFF, // do not print any output to console CONSOLE_OUTPUT_OFF, // do not print any output to console
CONSOLE_OUTPUT_ON, // print before concentrations to console CONSOLE_OUTPUT_ON, // print before and after concentrations to console
CONSOLE_OUTPUT_VERBOSE // print all concentration matrices to console CONSOLE_OUTPUT_VERBOSE // print all concentration matrices to console
}; };

3
src/Simulation.cpp
View File

@ -153,7 +153,6 @@ Grid Simulation::run() {
} }
if (this->csv_output > CSV_OUTPUT_OFF) { if (this->csv_output > CSV_OUTPUT_OFF) {
filename = createCSVfile(); filename = createCSVfile();
// printConcentrationsCSV(filename);
} }
if (approach == FTCS_APPROACH) { if (approach == FTCS_APPROACH) {
@ -162,7 +161,7 @@ Grid Simulation::run() {
if (console_output == CONSOLE_OUTPUT_VERBOSE && i > 0) { if (console_output == CONSOLE_OUTPUT_VERBOSE && i > 0) {
printConcentrationsConsole(); printConcentrationsConsole();
} }
if (csv_output == CSV_OUTPUT_VERBOSE && i > 0) { if (csv_output == CSV_OUTPUT_VERBOSE) {
printConcentrationsCSV(filename); printConcentrationsCSV(filename);
} }