From d73c9bd76b97b86b375c771c8b83afdc1325856b Mon Sep 17 00:00:00 2001
From: Kutscher <kutscher@irmb.tu-bs.de>
Date: Wed, 15 Mar 2023 17:25:21 +0100
Subject: [PATCH] rename calculator to simulation in apps
---
apps/cpu/ConvectionOfVortex/cov.cpp | 10 +++++-----
apps/cpu/CouetteFlow/cflow.cpp | 14 +++++++-------
apps/cpu/FlowAroundCylinder/cylinder.cpp | 10 +++++-----
apps/cpu/HerschelBulkleyModel/hbflow.cpp | 18 +++++++++---------
apps/cpu/HerschelBulkleySphere/hbsphere.cpp | 14 +++++++-------
apps/cpu/JetBreakup/JetBreakup.cpp | 12 ++++++------
apps/cpu/LaminarTubeFlow/ltf.cpp | 12 ++++++------
apps/cpu/Multiphase/Multiphase.cpp | 12 ++++++------
apps/cpu/MultiphaseDropletTest/droplet.cpp | 10 +++++-----
apps/cpu/PoiseuilleFlow/pf1.cpp | 12 ++++++------
apps/cpu/RisingBubble2D/RisingBubble2D.cpp | 10 +++++-----
apps/cpu/ViskomatXL/viskomat.cpp | 16 ++++++++--------
apps/cpu/rheometer/rheometer.cpp | 16 ++++++++--------
apps/cpu/sphere/sphere.cpp | 10 +++++-----
14 files changed, 88 insertions(+), 88 deletions(-)
diff --git a/apps/cpu/ConvectionOfVortex/cov.cpp b/apps/cpu/ConvectionOfVortex/cov.cpp
index 35da90e5e..c662d8953 100644
--- a/apps/cpu/ConvectionOfVortex/cov.cpp
+++ b/apps/cpu/ConvectionOfVortex/cov.cpp
@@ -290,15 +290,15 @@ void run()
//tav->setWithGhostLayer(true);
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
- calculator->addSimulationObserver(nupsSimulationObserver);
- calculator->addSimulationObserver(writeMQSimulationObserver);
- //calculator->addSimulationObserver(tav);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(nupsSimulationObserver);
+ simulation->addSimulationObserver(writeMQSimulationObserver);
+ //simulation->addSimulationObserver(tav);
//omp_set_num_threads(1);
if (myid==0) UBLOG(logINFO, "Simulation-start");
- calculator->run();
+ simulation->run();
if (myid==0) UBLOG(logINFO, "Simulation-end");
}
catch (std::exception& e)
diff --git a/apps/cpu/CouetteFlow/cflow.cpp b/apps/cpu/CouetteFlow/cflow.cpp
index 11bb9b4d5..4297d3ac1 100644
--- a/apps/cpu/CouetteFlow/cflow.cpp
+++ b/apps/cpu/CouetteFlow/cflow.cpp
@@ -266,15 +266,15 @@ void bflow(string configname)
SPtr<WriteThixotropyQuantitiesSimulationObserver> writeThixotropicMQSimulationObserver(new WriteThixotropyQuantitiesSimulationObserver(grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(outTime));
- SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
- calculator->addSimulationObserver(npr);
- calculator->addSimulationObserver(writeMQSimulationObserver);
- calculator->addSimulationObserver(writeThixotropicMQSimulationObserver);
- //calculator->addSimulationObserver(migSimulationObserver);
- //calculator->addSimulationObserver(restartSimulationObserver);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(writeMQSimulationObserver);
+ simulation->addSimulationObserver(writeThixotropicMQSimulationObserver);
+ //simulation->addSimulationObserver(migSimulationObserver);
+ //simulation->addSimulationObserver(restartSimulationObserver);
if (myid == 0) UBLOG(logINFO, "Simulation-start");
- calculator->run();
+ simulation->run();
if (myid == 0) UBLOG(logINFO, "Simulation-end");
}
catch (std::exception& e)
diff --git a/apps/cpu/FlowAroundCylinder/cylinder.cpp b/apps/cpu/FlowAroundCylinder/cylinder.cpp
index f5d19e9ad..f8c2ac467 100644
--- a/apps/cpu/FlowAroundCylinder/cylinder.cpp
+++ b/apps/cpu/FlowAroundCylinder/cylinder.cpp
@@ -315,13 +315,13 @@ void run(string configname)
omp_set_num_threads(numOfThreads);
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
- calculator->addSimulationObserver(nupsSimulationObserver);
- calculator->addSimulationObserver(fp);
- calculator->addSimulationObserver(writeMQSimulationObserver);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(nupsSimulationObserver);
+ simulation->addSimulationObserver(fp);
+ simulation->addSimulationObserver(writeMQSimulationObserver);
if(myid == 0) UBLOG(logINFO,"Simulation-start");
- calculator->run();
+ simulation->run();
if(myid == 0) UBLOG(logINFO,"Simulation-end");
}
catch(std::exception& e)
diff --git a/apps/cpu/HerschelBulkleyModel/hbflow.cpp b/apps/cpu/HerschelBulkleyModel/hbflow.cpp
index f581304e0..a8cf21347 100644
--- a/apps/cpu/HerschelBulkleyModel/hbflow.cpp
+++ b/apps/cpu/HerschelBulkleyModel/hbflow.cpp
@@ -321,17 +321,17 @@ void bflow(string configname)
SPtr<WriteThixotropyQuantitiesSimulationObserver> writeThixotropicMQSimulationObserver(new WriteThixotropyQuantitiesSimulationObserver(grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(outTime));
- SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
- calculator->addSimulationObserver(npr);
- calculator->addSimulationObserver(writeMQSimulationObserver);
- calculator->addSimulationObserver(writeThixotropicMQSimulationObserver);
- calculator->addSimulationObserver(fp);
- calculator->addSimulationObserver(fp2);
- //calculator->addSimulationObserver(migSimulationObserver);
- //calculator->addSimulationObserver(restartSimulationObserver);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(writeMQSimulationObserver);
+ simulation->addSimulationObserver(writeThixotropicMQSimulationObserver);
+ simulation->addSimulationObserver(fp);
+ simulation->addSimulationObserver(fp2);
+ //simulation->addSimulationObserver(migSimulationObserver);
+ //simulation->addSimulationObserver(restartSimulationObserver);
if (myid == 0) UBLOG(logINFO, "Simulation-start");
- calculator->run();
+ simulation->run();
if (myid == 0) UBLOG(logINFO, "Simulation-end");
}
catch (std::exception& e)
diff --git a/apps/cpu/HerschelBulkleySphere/hbsphere.cpp b/apps/cpu/HerschelBulkleySphere/hbsphere.cpp
index f2f47acd9..2b4e96aaa 100644
--- a/apps/cpu/HerschelBulkleySphere/hbsphere.cpp
+++ b/apps/cpu/HerschelBulkleySphere/hbsphere.cpp
@@ -351,15 +351,15 @@ void bflow(string configname)
SPtr<WriteThixotropyQuantitiesSimulationObserver> writeThixotropicMQSimulationObserver(new WriteThixotropyQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
- calculator->addSimulationObserver(npr);
- calculator->addSimulationObserver(fp);
- calculator->addSimulationObserver(writeMQSimulationObserver);
- calculator->addSimulationObserver(writeThixotropicMQSimulationObserver);
- calculator->addSimulationObserver(restartSimulationObserver);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(fp);
+ simulation->addSimulationObserver(writeMQSimulationObserver);
+ simulation->addSimulationObserver(writeThixotropicMQSimulationObserver);
+ simulation->addSimulationObserver(restartSimulationObserver);
if (myid == 0) UBLOG(logINFO, "Simulation-start");
- calculator->run();
+ simulation->run();
if (myid == 0) UBLOG(logINFO, "Simulation-end");
}
catch (std::exception& e)
diff --git a/apps/cpu/JetBreakup/JetBreakup.cpp b/apps/cpu/JetBreakup/JetBreakup.cpp
index 7d00fe1f8..b0b25bb07 100644
--- a/apps/cpu/JetBreakup/JetBreakup.cpp
+++ b/apps/cpu/JetBreakup/JetBreakup.cpp
@@ -596,15 +596,15 @@ void run(string configname)
#endif
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
- calculator->addSimulationObserver(npr);
- calculator->addSimulationObserver(pp);
- calculator->addSimulationObserver(timeDepBC);
- calculator->addSimulationObserver(rcp);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(pp);
+ simulation->addSimulationObserver(timeDepBC);
+ simulation->addSimulationObserver(rcp);
if (myid == 0)
UBLOG(logINFO, "Simulation-start");
- calculator->run();
+ simulation->run();
if (myid == 0)
UBLOG(logINFO, "Simulation-end");
} catch (std::exception &e) {
diff --git a/apps/cpu/LaminarTubeFlow/ltf.cpp b/apps/cpu/LaminarTubeFlow/ltf.cpp
index 0b398539a..c70c2c19e 100644
--- a/apps/cpu/LaminarTubeFlow/ltf.cpp
+++ b/apps/cpu/LaminarTubeFlow/ltf.cpp
@@ -328,14 +328,14 @@ void run(string configname)
omp_set_num_threads(numOfThreads);
numOfThreads = 1;
SPtr<UbScheduler> stepGhostLayer(visSch);
- SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, int(endTime)));
- calculator->addSimulationObserver(npr);
- calculator->addSimulationObserver(pp);
- calculator->addSimulationObserver(migSimulationObserver);
- //calculator->addSimulationObserver(timeDepBC);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, int(endTime)));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(pp);
+ simulation->addSimulationObserver(migSimulationObserver);
+ //simulation->addSimulationObserver(timeDepBC);
if (myid == 0) VF_LOG_INFO("Simulation-start");
- calculator->run();
+ simulation->run();
if (myid == 0) VF_LOG_INFO("Simulation-end");
}
catch (std::exception& e)
diff --git a/apps/cpu/Multiphase/Multiphase.cpp b/apps/cpu/Multiphase/Multiphase.cpp
index b04c78589..4c30d97e5 100644
--- a/apps/cpu/Multiphase/Multiphase.cpp
+++ b/apps/cpu/Multiphase/Multiphase.cpp
@@ -472,18 +472,18 @@ void run(string configname)
#endif
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
- calculator->addSimulationObserver(npr);
- calculator->addSimulationObserver(pp);
- calculator->addSimulationObserver(timeDepBC);
- calculator->addSimulationObserver(rcp);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(pp);
+ simulation->addSimulationObserver(timeDepBC);
+ simulation->addSimulationObserver(rcp);
if (myid == 0)
UBLOG(logINFO, "Simulation-start");
- calculator->run();
+ simulation->run();
if (myid == 0)
UBLOG(logINFO, "Simulation-end");
} catch (std::exception &e) {
diff --git a/apps/cpu/MultiphaseDropletTest/droplet.cpp b/apps/cpu/MultiphaseDropletTest/droplet.cpp
index 5a12f039c..a5658a8f3 100644
--- a/apps/cpu/MultiphaseDropletTest/droplet.cpp
+++ b/apps/cpu/MultiphaseDropletTest/droplet.cpp
@@ -391,15 +391,15 @@ void run(string configname)
omp_set_num_threads(numOfThreads);
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
- calculator->addSimulationObserver(npr);
- calculator->addSimulationObserver(pp);
- calculator->addSimulationObserver(rcp);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(pp);
+ simulation->addSimulationObserver(rcp);
if (myid == 0)
UBLOG(logINFO, "Simulation-start");
- calculator->run();
+ simulation->run();
if (myid == 0)
UBLOG(logINFO, "Simulation-end");
diff --git a/apps/cpu/PoiseuilleFlow/pf1.cpp b/apps/cpu/PoiseuilleFlow/pf1.cpp
index cb4528b3a..0e21dea4d 100644
--- a/apps/cpu/PoiseuilleFlow/pf1.cpp
+++ b/apps/cpu/PoiseuilleFlow/pf1.cpp
@@ -191,14 +191,14 @@ void pf1()
//start simulation
//omp_set_num_threads(numOfThreads);
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(outTime));
- SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
- calculator->addSimulationObserver(npr);
- calculator->addSimulationObserver(writeMQSimulationObserver);
- //calculator->addSimulationObserver(migSimulationObserver);
- //calculator->addSimulationObserver(restartSimulationObserver);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(writeMQSimulationObserver);
+ //simulation->addSimulationObserver(migSimulationObserver);
+ //simulation->addSimulationObserver(restartSimulationObserver);
if (myid == 0) UBLOG(logINFO, "Simulation-start");
- calculator->run();
+ simulation->run();
if (myid == 0) UBLOG(logINFO, "Simulation-end");
ppblocks->update(10);
diff --git a/apps/cpu/RisingBubble2D/RisingBubble2D.cpp b/apps/cpu/RisingBubble2D/RisingBubble2D.cpp
index a5cd0aff9..e1bfec976 100644
--- a/apps/cpu/RisingBubble2D/RisingBubble2D.cpp
+++ b/apps/cpu/RisingBubble2D/RisingBubble2D.cpp
@@ -406,15 +406,15 @@ void run(string configname)
//omp_set_num_threads(numOfThreads);
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
- calculator->addSimulationObserver(npr);
- calculator->addSimulationObserver(pp);
- calculator->addSimulationObserver(rcp);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(pp);
+ simulation->addSimulationObserver(rcp);
if (myid == 0)
UBLOG(logINFO, "Simulation-start");
- calculator->run();
+ simulation->run();
if (myid == 0)
UBLOG(logINFO, "Simulation-end");
diff --git a/apps/cpu/ViskomatXL/viskomat.cpp b/apps/cpu/ViskomatXL/viskomat.cpp
index addceee87..d1a3cc3ee 100644
--- a/apps/cpu/ViskomatXL/viskomat.cpp
+++ b/apps/cpu/ViskomatXL/viskomat.cpp
@@ -431,16 +431,16 @@ void bflow(string configname)
//SPtr<WriteThixotropyQuantitiesSimulationObserver> writeThixotropicMQSimulationObserver(new WriteThixotropyQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
- calculator->addSimulationObserver(npr);
- //calculator->addSimulationObserver(fp);
- calculator->addSimulationObserver(fp2);
- //calculator->addSimulationObserver(writeMQSimulationObserver);
- //calculator->addSimulationObserver(writeThixotropicMQSimulationObserver);
- calculator->addSimulationObserver(restartSimulationObserver);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ //simulation->addSimulationObserver(fp);
+ simulation->addSimulationObserver(fp2);
+ //simulation->addSimulationObserver(writeMQSimulationObserver);
+ //simulation->addSimulationObserver(writeThixotropicMQSimulationObserver);
+ simulation->addSimulationObserver(restartSimulationObserver);
if (myid == 0) UBLOG(logINFO, "Simulation-start");
- calculator->run();
+ simulation->run();
if (myid == 0) UBLOG(logINFO, "Simulation-end");
}
catch (std::exception& e)
diff --git a/apps/cpu/rheometer/rheometer.cpp b/apps/cpu/rheometer/rheometer.cpp
index 5b716ffb6..173299b0e 100644
--- a/apps/cpu/rheometer/rheometer.cpp
+++ b/apps/cpu/rheometer/rheometer.cpp
@@ -422,16 +422,16 @@ void bflow(string configname)
SPtr<WriteThixotropyQuantitiesSimulationObserver> writeThixotropicMQSimulationObserver(new WriteThixotropyQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endTime));
- calculator->addSimulationObserver(npr);
- calculator->addSimulationObserver(fp);
- calculator->addSimulationObserver(fp2);
- calculator->addSimulationObserver(writeMQSimulationObserver);
- calculator->addSimulationObserver(writeThixotropicMQSimulationObserver);
- //calculator->addSimulationObserver(restartSimulationObserver);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(fp);
+ simulation->addSimulationObserver(fp2);
+ simulation->addSimulationObserver(writeMQSimulationObserver);
+ simulation->addSimulationObserver(writeThixotropicMQSimulationObserver);
+ //simulation->addSimulationObserver(restartSimulationObserver);
if (myid == 0) UBLOG(logINFO, "Simulation-start");
- calculator->run();
+ simulation->run();
if (myid == 0) UBLOG(logINFO, "Simulation-end");
}
catch (std::exception& e)
diff --git a/apps/cpu/sphere/sphere.cpp b/apps/cpu/sphere/sphere.cpp
index c9677c0a5..f8249f70a 100644
--- a/apps/cpu/sphere/sphere.cpp
+++ b/apps/cpu/sphere/sphere.cpp
@@ -293,14 +293,14 @@ void run(string configname)
fp->addInteractor(sphereInt);
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, endstep));
- calculator->addSimulationObserver(npr);
- calculator->addSimulationObserver(fp);
- calculator->addSimulationObserver(writeMQSimulationObserver);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endstep));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(fp);
+ simulation->addSimulationObserver(writeMQSimulationObserver);
if (myid == 0) UBLOG(logINFO, "Simulation-start");
- calculator->run();
+ simulation->run();
if (myid == 0) UBLOG(logINFO, "Simulation-end");
}
--
GitLab