diff --git a/source/Applications/DLR-F16-Solid/f16-solid-coarse.cfg b/source/Applications/DLR-F16-Solid/f16-solid-coarse.cfg
index ef4dfc22d540e8f2f234e4cfa5d1cb0fcaad6e46..b7d71f4f0d3eb0333b387d107cc2b0d154e29deb 100644
--- a/source/Applications/DLR-F16-Solid/f16-solid-coarse.cfg
+++ b/source/Applications/DLR-F16-Solid/f16-solid-coarse.cfg
@@ -1,4 +1,4 @@
-pathOut = d:/temp/DLR-F16-Solid-L6
+pathOut = d:/temp/DLR-F16-Solid-L1-BV
pathGeo = d:/Projects/SFB880/DLR-F16/Geometry
fngFileWhole1 = F16_broad_Quad_noTape_full.stl
@@ -27,40 +27,37 @@ boundingBox = -0.3 1.17 0.0 0.03 -1.17 1.17
blockNx = 10 10 10
-refineLevel = 6
+refineLevel = 1
#deltaXfine = 0.003 #level 0
-#deltaXfine = 0.0015 #level 1
+deltaXfine = 0.0015 #level 1
#deltaXfine = 0.00075 #level 2
#deltaXfine = 0.000375 #level 3
#deltaXfine = 0.0001875 #level 4
#deltaXfine = 0.00009375 #level 5
-deltaXfine = 0.000046875 #level 6
+#deltaXfine = 0.000046875 #level 6
#deltaXfine = 0.0000234375 #level 7
startDistance = -1.0e-3
refineDistance = 0.6e-3
#refineDistance = 30.0e-3
-writeBlocks = true
+writeBlocks = false
-newStart = true
-restartStep = 3000
+newStart = false
+restartStep = 15010
-cpStep = 1000
-cpStart = 1000
+cpStep = 10
+cpStart = 10
-outTimeStep = 100
-outTimeStart = 100
+outTimeStep = 10
+outTimeStart = 10
-endTime = 3100
+timeAvStart = 14000
+timeAvStop = 15000
+nupsStep = 100 100 10000000
-#Cp
-#pcpStart = 1000000
-#pcpStop = 1000000
+endTime = 15020
-timeAvStart = 3000
-timeAvStop = 5000
-nupsStep = 100 100 10000000
diff --git a/source/Applications/DLR-F16-Solid/f16.cpp b/source/Applications/DLR-F16-Solid/f16.cpp
index c1020963ab9fcc71f177ee502a32de58927c081b..33403f32a556259f285e29cb219e6992f7c4d20d 100644
--- a/source/Applications/DLR-F16-Solid/f16.cpp
+++ b/source/Applications/DLR-F16-Solid/f16.cpp
@@ -654,8 +654,8 @@ void run(string configname)
}
else
{
- restartCoProcessor->restart((int)restartStep);
- //migCoProcessor->restart((int)restartStep);
+ //restartCoProcessor->restart((int)restartStep);
+ migCoProcessor->restart((int)restartStep);
grid->setTimeStep(restartStep);
////////////////////////////////////////////////////////////////////////////
InterpolationProcessorPtr iProcessor(new CompressibleOffsetInterpolationProcessor());
@@ -700,8 +700,8 @@ void run(string configname)
std::vector<UbTupleFloat3> nodes;
for (int i = 0; i <= 10; i++)
{
- micCoProcessor->addMicrophone(Vector3D(0.31+offsetX1*double(i), 0.015, 0.0-offsetZ1*double(i)));
- nodes.push_back(UbTupleFloat3(float(0.31+offsetX1*float(i)), float(0.015), float(0.0-offsetZ1*float(i))));
+ micCoProcessor->addMicrophone(Vector3D(0.3+deltaXcoarse+offsetX1*double(i), 0.015, 0.0-offsetZ1*double(i)));
+ nodes.push_back(UbTupleFloat3(float(0.3+deltaXcoarse+offsetX1*float(i)), float(0.015), float(0.0-offsetZ1*float(i))));
}
double offsetX2 = 0.1;
for (int i = 0; i <= 6; i++)
@@ -712,12 +712,13 @@ void run(string configname)
if (myid==0) WbWriterVtkXmlBinary::getInstance()->writeNodes(pathOut+"/geo/mic", nodes);
- omp_set_num_threads(numOfThreads);
+ //omp_set_num_threads(numOfThreads);
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
SPtr<Calculator> calculator(new BasicCalculator(grid, stepGhostLayer, endTime));
calculator->addCoProcessor(nupsCoProcessor);
calculator->addCoProcessor(micCoProcessor);
- calculator->addCoProcessor(restartCoProcessor);
+ //calculator->addCoProcessor(restartCoProcessor);
+ calculator->addCoProcessor(migCoProcessor);
calculator->addCoProcessor(writeMQSelectCoProcessor);
calculator->addCoProcessor(writeMQCoProcessor);
calculator->addCoProcessor(tav);
diff --git a/source/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.cpp b/source/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.cpp
index 86bc2b7a35c816442a6135b394696c888ccd9001..de496c427a41bca74f3c8a942ea197c6160c26c9 100644
--- a/source/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.cpp
+++ b/source/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.cpp
@@ -14,6 +14,7 @@
MicrophoneArrayCoProcessor::MicrophoneArrayCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string & path, SPtr<Communicator> comm) : CoProcessor(grid, s), path(path), comm(comm)
{
count = 0;
+ micID = 0;
}
MicrophoneArrayCoProcessor::~MicrophoneArrayCoProcessor()
@@ -33,11 +34,11 @@ void MicrophoneArrayCoProcessor::process(double step)
UBLOG(logDEBUG3, "MicrophoneArrayCoProcessor::process:" << step);
}
-void MicrophoneArrayCoProcessor::addMicrophone(Vector3D coords)
+bool MicrophoneArrayCoProcessor::addMicrophone(Vector3D coords)
{
+ micID++;
UbTupleInt3 blockIndexes = grid->getBlockIndexes(coords[0], coords[1], coords[2]);
- //int gridRank = comm->getProcessID();
int minInitLevel = this->grid->getCoarsestInitializedLevel();
int maxInitLevel = this->grid->getFinestInitializedLevel();
@@ -64,12 +65,14 @@ void MicrophoneArrayCoProcessor::addMicrophone(Vector3D coords)
calcMacros = &D3Q27System::calcIncompMacroscopicValues;
}
SPtr<Mic> mic(new Mic);
+ mic->id = micID;
mic->distridution = kernel->getDataSet()->getFdistributions();
mic->nodeIndexes = grid->getNodeIndexes(block, coords[0], coords[1], coords[2]);
microphones.push_back(mic);
- values.resize((microphones.size()+1)*static_cast<int>(scheduler->getMinStep()));
- std::string fname = path+"/mic/mic_"+UbSystem::toString(comm->getProcessID())+".csv";
+ strVector.resize(microphones.size());
+
+ std::string fname = path+"/mic/mic_"+UbSystem::toString(micID)+".csv";
std::ofstream ostr;
ostr.open(fname.c_str(), std::ios_base::out | std::ios_base::app);
if (!ostr)
@@ -80,53 +83,42 @@ void MicrophoneArrayCoProcessor::addMicrophone(Vector3D coords)
if (!ostr) throw UbException(UB_EXARGS, "couldn't open file "+fname);
}
ostr << "#microphone position: " << coords[0] << "; " << coords[1] << "; " << coords[2] << "; " << "\n";
- return;
+ ostr.close();
+ return true;
}
}
}
}
+ return false;
}
void MicrophoneArrayCoProcessor::collectData(double step)
{
- values[count++] = step;
- for (SPtr<Mic> mic : microphones)
+ for (int i = 0; i < microphones.size(); i++ )
{
LBMReal f[D3Q27System::ENDF+1];
- mic->distridution->getDistribution(f, val<1>(mic->nodeIndexes), val<2>(mic->nodeIndexes), val<3>(mic->nodeIndexes));
+ microphones[i]->distridution->getDistribution(f, val<1>(microphones[i]->nodeIndexes), val<2>(microphones[i]->nodeIndexes), val<3>(microphones[i]->nodeIndexes));
LBMReal vx1, vx2, vx3, rho;
calcMacros(f, rho, vx1, vx2, vx3);
- values[count++] = rho;
+ strVector[i] << step << ';' << rho << '\n';
}
}
void MicrophoneArrayCoProcessor::writeFile(double step)
{
- std::string fname = path+"/mic/mic_"+UbSystem::toString(comm->getProcessID())+".csv";
- std::ofstream ostr;
- ostr.open(fname.c_str(), std::ios_base::out | std::ios_base::app);
- if (!ostr)
- {
- ostr.clear();
- std::string path = UbSystem::getPathFromString(fname);
- if (path.size()>0) { UbSystem::makeDirectory(path); ostr.open(fname.c_str(), std::ios_base::out | std::ios_base::app); }
- if (!ostr) throw UbException(UB_EXARGS, "couldn't open file "+fname);
- }
-
- int line_size = static_cast<int>(microphones.size()+1);
- int total_size = static_cast<int>(values.size());
-
- for (int i = 0; i < total_size; i+=line_size)
+ for (int i = 0; i < microphones.size(); i++)
{
- int index = 0;
- for (int j = 0; j < line_size; j++)
+ std::string fname = path+"/mic/mic_"+UbSystem::toString(microphones[i]->id)+".csv";
+ std::ofstream ostr;
+ ostr.open(fname.c_str(), std::ios_base::out | std::ios_base::app);
+ if (!ostr)
{
- ostr << values[i+j] << ";";
+ ostr.clear();
+ std::string path = UbSystem::getPathFromString(fname);
+ if (path.size()>0) { UbSystem::makeDirectory(path); ostr.open(fname.c_str(), std::ios_base::out | std::ios_base::app); }
+ if (!ostr) throw UbException(UB_EXARGS, "couldn't open file "+fname);
}
- ostr << "\n";
+ ostr << strVector[i].str();
+ ostr.close();
}
-
- ostr.close();
- count = 0;
- //UBLOG(logINFO,"MicrophoneArrayCoProcessor step: " << static_cast<int>(step));
-}
+}
\ No newline at end of file
diff --git a/source/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.h b/source/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.h
index 58a8c4f97dffe8fd734e910a9b73b6e97a0b1e42..67b1aadca5d18a66384f430909f517af77a75ecb 100644
--- a/source/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.h
+++ b/source/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.h
@@ -29,24 +29,26 @@ public:
void process(double step) override;
//! add microphone
- void addMicrophone(Vector3D coords);
+ bool addMicrophone(Vector3D coords);
protected:
void collectData(double step);
void writeFile(double step);
private:
- std::string path; //! output filename, e.g. pathname + "/steps/timeseries"
+ std::string path;
SPtr<Communicator> comm;
struct Mic
{
+ unsigned int id;
SPtr<DistributionArray3D> distridution;
UbTupleInt3 nodeIndexes;
};
std::vector< SPtr<Mic> > microphones;
- std::vector< double > values;
+ std::vector<std::stringstream > strVector;
int count;
+ int micID;
typedef void(*CalcMacrosFct)(const LBMReal* const& /*feq[27]*/, LBMReal& /*(d)rho*/, LBMReal& /*vx1*/, LBMReal& /*vx2*/, LBMReal& /*vx3*/);
CalcMacrosFct calcMacros;
diff --git a/source/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp b/source/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp
index 163f7f5a7739000d37809b2f8fd50a1a402df72a..c1a3b76f2c08e8750d8805a8c6c3ba0ad83c43e4 100644
--- a/source/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp
+++ b/source/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp
@@ -82,6 +82,16 @@ void TimeAveragedValuesCoProcessor::init()
{
initData();
}
+ else
+ {
+ blockVector.clear();
+ blockVector.resize(maxInitLevel + 1);
+ for (int level = minInitLevel; level <= maxInitLevel; level++)
+ {
+ grid->getBlocks(level, gridRank, true, blockVector[level]);
+ if (blockVector[level].size() > 0) compressible = blockVector[level][0]->getKernel()->getCompressible();
+ }
+ }
}
//////////////////////////////////////////////////////////////////////////
void TimeAveragedValuesCoProcessor::initData()