Commit 68e58958 authored by Bianca Tost's avatar Bianca Tost

removed datasources for probability for trajectories computed in Met.3D

parent 3f808756
......@@ -456,15 +456,21 @@ void MSelectDataSourceDialog::createTrajectoryDataSourceEntries()
{
QString dataSourceID = dataSources[idl];
if (checkForTrajectoryDataSource(dataSourceID))
// Use Reader to identify trajectory data sources.
if (dataSourceID.endsWith(" Reader"))
{
// Add a row to the table..
int row = table->rowCount();
table->setRowCount(row + 1);
// .. and insert the element.
table->setItem(row, 0, new QTableWidgetItem(dataSources[idl]));
dataSourceID.chop(7);
dataSourceAvailable = true;
if (checkForTrajectoryDataSource(dataSourceID))
{
// Add a row to the table..
int row = table->rowCount();
table->setRowCount(row + 1);
// .. and insert the element.
table->setItem(row, 0, new QTableWidgetItem(dataSourceID));
dataSourceAvailable = true;
}
}
} // for (data loaders)
......
......@@ -775,7 +775,7 @@ void MPipelineConfiguration::initializePrecomputedTrajectoriesPipeline(
// Initialize trajectory pipeline.
initializeEnsembleTrajectoriesPipeline(
dataSourceId, boundaryLayerTrajectories,
trajectoryReader, scheduler, memoryManager);
trajectoryReader, scheduler, memoryManager, false);
LOG4CPLUS_DEBUG(mlog, "Pipeline ''" << dataSourceId.toStdString()
<< "'' has been initialized.");
......@@ -915,7 +915,7 @@ void MPipelineConfiguration::initializeTrajectoryComputationPipeline(
// Initialize trajectory pipeline.
initializeEnsembleTrajectoriesPipeline(
dataSourceId, boundaryLayerTrajectories,
trajectoryComputation, scheduler, memoryManager);
trajectoryComputation, scheduler, memoryManager, true);
LOG4CPLUS_DEBUG(mlog, "Pipeline ''" << dataSourceId.toStdString()
<< "'' has been initialized.");
......@@ -927,7 +927,8 @@ void MPipelineConfiguration::initializeEnsembleTrajectoriesPipeline(
bool boundaryLayerTrajectories,
MTrajectoryDataSource* baseDataSource,
MAbstractScheduler* scheduler,
MAbstractMemoryManager* memoryManager)
MAbstractMemoryManager* memoryManager,
bool trajectoriesComputedInMet3D)
{
QStringList dataSourceIDs = QStringList()
<< (dataSourceId + QString(" timestepFilter"))
......@@ -984,6 +985,15 @@ void MPipelineConfiguration::initializeEnsembleTrajectoriesPipeline(
sysMC->registerDataSource(dataSourceId + QString(" Normals"),
trajectoryNormals);
// TODO (bt, 03Aug2018): Remove this when trajectories probability data sources
// are implemented for trajectories computed in Met.3D.
// Trajectories probability data sources are not implemented yet for
// trajectories computed in Met.3D.
if (trajectoriesComputedInMet3D)
{
return;
}
// Probability filter.
MWeatherPredictionDataSource* pwcbSource;
if (boundaryLayerTrajectories)
......
......@@ -165,7 +165,8 @@ protected:
bool boundaryLayerTrajectories,
MTrajectoryDataSource* baseDataSource,
MAbstractScheduler* scheduler,
MAbstractMemoryManager* memoryManager);
MAbstractMemoryManager* memoryManager,
bool trajectoriesComputedInMet3D);
/**
Initializes hard-coded pipelines. Use this method for development
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment