From 44eaf56d8000efacd776913c8ccd01d3ec85e5ba Mon Sep 17 00:00:00 2001
From: Alexander Jaust <alexander.jaust@ipvs.uni-stuttgart.de>
Date: Thu, 25 Apr 2019 13:24:05 +0200
Subject: [PATCH] removed files called 'wrapper'
---
.../iterative/precicewrapper.cc | 354 ------------------
.../iterative/precicewrapper.hh | 155 --------
2 files changed, 509 deletions(-)
delete mode 100644 appl/conjugateheattransfer/iterative/precicewrapper.cc
delete mode 100644 appl/conjugateheattransfer/iterative/precicewrapper.hh
diff --git a/appl/conjugateheattransfer/iterative/precicewrapper.cc b/appl/conjugateheattransfer/iterative/precicewrapper.cc
deleted file mode 100644
index c210e03..0000000
--- a/appl/conjugateheattransfer/iterative/precicewrapper.cc
+++ /dev/null
@@ -1,354 +0,0 @@
-#include "precicewrapper.hh"
-
-#include <cassert>
-
-using namespace precice_wrapper;
-
-PreciceWrapper::PreciceWrapper():
- wasCreated_(false), precice_(nullptr), meshWasCreated_(false), preciceWasInitialized_(false),
- meshID_(0), heatFluxID_(0), temperatureID_(0), timeStepSize_(0.)
-{
-
-}
-
-PreciceWrapper& PreciceWrapper::getInstance()
-{
- static PreciceWrapper instance;
- return instance;
-}
-
-void PreciceWrapper::configure( const std::string& configurationFileName )
-{
- precice_->configure( configurationFileName );
-}
-/*
-void PreciceWrapper::announceHeatFluxToWrite(const HeatFluxType heatFluxType)
-{
- writeHeatFluxType_ = heatFluxType;
-}
-
-void PreciceWrapper::announceHeatFluxToRead(const HeatFluxType heatFluxType)
-{
- readHeatFluxType_ = heatFluxType;
-}
-*/
-void PreciceWrapper::announceSolver( const std::string& name, const int rank, const int size )
-{
- assert( precice_ == nullptr );
- precice_ = std::make_unique<precice::SolverInterface>(name, rank, size);
- wasCreated_ = true;
-}
-
-int PreciceWrapper::getDimensions()
-{
- assert( wasCreated_ );
- return precice_->getDimensions();
-}
-/*
-void PreciceWrapper::setMeshName(const std::string& meshName)
-{
- assert( wasCreated_ );
- meshID_ = precice_->getMeshID(meshName);
-}
-*/
-void PreciceWrapper::setMesh(const std::string& meshName,
- const size_t numPoints,
- std::vector<double>& coordinates,
- const std::vector<int>& dumuxFaceIDs )
-{
- assert( wasCreated_ );
- assert( numPoints == dumuxFaceIDs.size() );
- meshID_ = precice_->getMeshID(meshName);
- vertexIDs_.resize( numPoints );
- precice_->setMeshVertices( meshID_, numPoints, coordinates.data(), vertexIDs_.data() );
- indexMapper_.createMapping( dumuxFaceIDs, vertexIDs_);
- meshWasCreated_ = true;
-}
-/*
-int PreciceWrapper::getDataID( const std::string& dataName, const int meshID )
-{
- assert( wasCreated_ );
- return precice_->getDataID( dataName, meshID );
-}
-*/
-double PreciceWrapper::initialize()
-{
- assert( wasCreated_ );
- assert( meshWasCreated_ );
-
- heatFluxID_ = precice_->getDataID( "Heat-Flux", meshID_ );
- temperatureID_ = precice_->getDataID( "Temperature", meshID_ );
-
- heatFlux_.resize( getNumberOfVertices() );
- temperature_.resize( getNumberOfVertices() );
-
- timeStepSize_ = precice_->initialize();
- assert( timeStepSize_ > 0 );
-
- preciceWasInitialized_ = true;
- return timeStepSize_;
-}
-
-void PreciceWrapper::initializeData()
-{
- assert( preciceWasInitialized_ );
- precice_->initializeData();
-}
-
-void PreciceWrapper::finalize()
-{
- assert( wasCreated_ );
- precice_->finalize();
-}
-
-/*
-void PreciceWrapper::initializeData()
-{
- assert( wasCreated_ );
- precice_->initializeData();
-}
-*/
-
-double PreciceWrapper::advance( const double computedTimeStepLength )
-{
- assert( wasCreated_ );
- return precice_->advance( computedTimeStepLength );
-}
-
-bool PreciceWrapper::isCouplingOngoing()
-{
- assert( wasCreated_ );
- return precice_->isCouplingOngoing();
-}
-
-size_t PreciceWrapper::getNumberOfVertices()
-{
- assert( wasCreated_ );
- return vertexIDs_.size();
-}
-
-double PreciceWrapper::getHeatFluxOnFace( const int faceID) const
-{
- assert( wasCreated_ );
- const auto idx = indexMapper_.getPreciceId( faceID );
- assert(idx < heatFlux_.size() );
- return heatFlux_[idx];
-}
-
-void PreciceWrapper::writeHeatFluxOnFace(const int faceID,
- const double value)
-{
- assert( wasCreated_ );
- const auto idx = indexMapper_.getPreciceId( faceID );
- assert(idx < heatFlux_.size() );
- heatFlux_[idx] = value;
-}
-
-double PreciceWrapper::getTemperatureOnFace(const int faceID) const
-{
- assert( wasCreated_ );
- const auto idx = indexMapper_.getPreciceId( faceID );
- assert(idx < temperature_.size() );
- return temperature_[idx];
-}
-
-void PreciceWrapper::writeTemperatureOnFace(const int faceID, const double value)
-{
- assert( wasCreated_ );
- const auto idx = indexMapper_.getPreciceId( faceID );
- assert(idx < temperature_.size() );
- temperature_[idx] = value;
-}
-
-void PreciceWrapper::writeHeatFluxToOtherSolver()
-{
- assert( wasCreated_ );
- writeBlockScalarDataToPrecice( heatFluxID_, heatFlux_ );
-}
-
-void PreciceWrapper::readHeatFluxFromOtherSolver()
-{
- assert( wasCreated_ );
- readBlockScalarDataFromPrecice( heatFluxID_, heatFlux_ );
-}
-
-void PreciceWrapper::writeTemperatureToOtherSolver()
-{
- assert( wasCreated_ );
- writeBlockScalarDataToPrecice( temperatureID_, temperature_ );
-}
-
-void PreciceWrapper::readTemperatureFromOtherSolver()
-{
- assert( wasCreated_ );
- readBlockScalarDataFromPrecice( temperatureID_, temperature_ );
-}
-
-bool PreciceWrapper::isCoupledEntity(const int faceID) const
-{
- assert( wasCreated_ );
- return indexMapper_.isDumuxIdMapped( faceID );
-}
-/*
-std::vector<double>& PreciceWrapper::getHeatFluxToWrite()
-{
- assert( wasCreated_ );
- assert( writeHeatFluxType_ != HeatFluxType::UNDEFINED);
- if ( writeHeatFluxType_ == HeatFluxType::FreeFlow )
- return freeFlowHeatFlux_;
- else
- return solidHeatFlux_;
-}
-*/
-//void PreciceWrapper::readScalarQuantitiy(const int dataID, std::vector<double> &data)
-//{
-// assert( wasCreated_ );
-// precice_->readBlockScalarData( dataID, vertexIDs_.size(),
-// vertexIDs_.data(), data.data() );
-//}
-//
-//void PreciceWrapper::writeScalarQuantitiy(const int dataID, std::vector<double> &data)
-//{
-// assert( wasCreated_ );
-// precice_->writeBlockScalarData( dataID, vertexIDs_.size(),
-// vertexIDs_.data(), data.data() );
-//}
-
-void PreciceWrapper::print(std::ostream& os)
-{
- os << indexMapper_;
-}
-
-/*
-void PreciceWrapper::writeSolidTemperature(std::vector<double> &temperature)
-{
- assert( wasCreated_ );
- precice_->writeBlockScalarData( solidTemperatureID_, vertexIDs_.size(),
- vertexIDs_.data(), temperature.data() );
-
-}
-
-void PreciceWrapper::readSolidTemperature(std::vector<double> &temperature)
-{
- assert( wasCreated_ );
- precice_->readBlockScalarData( solidTemperatureID_, vertexIDs_.size(),
- vertexIDs_.data(), temperature.data() );
-}
-*/
-
-/*
-void PreciceWrapper::readBlockScalarData( const int dataID,
- const int size,
- int* const valueIndices,
- double* const values )
-{
- assert( wasCreated_ );
- precice_->readBlockScalarData( dataID, size, valueIndices, values );
-}
-
-void PreciceWrapper::writeBlockScalarData( const int dataID,
- const int size,
- int* const valueIndices,
- double* const values )
-{
- assert( wasCreated_ );
- return precice_->writeBlockScalarData( dataID, size, valueIndices, values );
-}
-*/
-
-bool PreciceWrapper::checkIfActionIsRequired( const std::string& condition )
-{
- assert( wasCreated_ );
- return precice_->isActionRequired( condition );
-}
-
-void PreciceWrapper::actionIsFulfilled(const std::string& condition)
-{
- assert( wasCreated_ );
- precice_->fulfilledAction( condition );
-}
-
-void PreciceWrapper::readBlockScalarDataFromPrecice(const int dataID, std::vector<double> &data)
-{
- assert( wasCreated_ );
- assert( vertexIDs_.size() == data.size() );
- precice_->readBlockScalarData( dataID, vertexIDs_.size(), vertexIDs_.data(), data.data() );
-}
-
-void PreciceWrapper::writeBlockScalarDataToPrecice(const int dataID, std::vector<double> &data)
-{
- assert( wasCreated_ );
- assert( vertexIDs_.size() == data.size() );
- precice_->writeBlockScalarData( dataID, vertexIDs_.size(), vertexIDs_.data(), data.data() );
-}
-
-bool PreciceWrapper::hasToWriteInitialData()
-{
- assert( wasCreated_ );
- return checkIfActionIsRequired(precice::constants::actionWriteInitialData());
-}
-
-void PreciceWrapper::announceInitialDataWritten()
-{
- assert( wasCreated_ );
- writeHeatFluxToOtherSolver();
- precice_->fulfilledAction( precice::constants::actionWriteInitialData() );
-}
-
-bool PreciceWrapper::isInitialDataAvailable()
-{
- assert( wasCreated_ );
- return precice_->isReadDataAvailable();
-}
-
-
-bool PreciceWrapper::hasToReadIterationCheckpoint()
-{
- assert( wasCreated_ );
- return checkIfActionIsRequired(precice::constants::actionReadIterationCheckpoint());
-}
-
-void PreciceWrapper::announceIterationCheckpointRead()
-{
- assert( wasCreated_ );
- actionIsFulfilled( precice::constants::actionReadIterationCheckpoint() );
-}
-
-bool PreciceWrapper::hasToWriteIterationCheckpoint()
-{
- assert( wasCreated_ );
- return checkIfActionIsRequired(precice::constants::actionWriteIterationCheckpoint());
-}
-
-void PreciceWrapper::announceIterationCheckpointWritten()
-{
- assert( wasCreated_ );
- actionIsFulfilled( precice::constants::actionWriteIterationCheckpoint() );
-}
-
-/*
-void PreciceWrapper::writeInitialBlockScalarData( const int dataID,
- const int size,
- int* const valueIndices,
- double* const values )
-{
- assert( wasCreated_ );
- if ( hasToWriteInitialData() )
- {
- precice_->writeBlockScalarData( dataID, size, valueIndices, values );
- }
-}
-
-void PreciceWrapper::announceAllInitialDataWritten()
-{
- assert( wasCreated_ );
- if ( hasToWriteInitialData() )
- {
- precice_->fulfilledAction( precice::constants::actionWriteInitialData() );
- }
-}
-*/
-PreciceWrapper::~PreciceWrapper()
-{
-}
-
diff --git a/appl/conjugateheattransfer/iterative/precicewrapper.hh b/appl/conjugateheattransfer/iterative/precicewrapper.hh
deleted file mode 100644
index 3af4c6c..0000000
--- a/appl/conjugateheattransfer/iterative/precicewrapper.hh
+++ /dev/null
@@ -1,155 +0,0 @@
-#ifndef PRECICEWRAPPER_HH
-#define PRECICEWRAPPER_HH
-
-#include<string>
-#include<ostream>
-#include<precice/SolverInterface.hpp>
-
-#include "dumuxpreciceindexwrapper.hh"
-
-namespace precice_wrapper{
-
- /*
- enum HeatFluxType
- {
- UNDEFINED, FreeFlow, Solid
- };
- */
-
-class PreciceWrapper
-{
-
-private:
- bool wasCreated_;
- std::unique_ptr<precice::SolverInterface> precice_;
-
- PreciceWrapper();
-
- bool checkIfActionIsRequired( const std::string& condition );
- void actionIsFulfilled( const std::string& condition );
-
- void readBlockScalarDataFromPrecice( const int dataID, std::vector<double>& data );
- void writeBlockScalarDataToPrecice( const int dataID, std::vector<double>& data );
-
- bool meshWasCreated_;
- bool preciceWasInitialized_;
- int meshID_;
- int dimension_;
- int heatFluxID_;
- int temperatureID_;
-
- double timeStepSize_;
-
- /*
- HeatFluxType writeHeatFluxType_;
- HeatFluxType readHeatFluxType_;
- */
-
-
- std::vector<int> vertexIDs_; //should be size_t
- std::vector<double> heatFlux_;
- std::vector<double> temperature_;
-
- DumuxPreciceIndexMapper<int> indexMapper_;
-
-
- ~PreciceWrapper();
-public:
- PreciceWrapper(const PreciceWrapper&) = delete;
- void operator=(const PreciceWrapper&) = delete;
-
- static PreciceWrapper& getInstance();
-
- void announceSolver( const std::string& name, const int rank, const int size );
- void configure( const std::string& configurationFileName );
-
- /*
- void announceHeatFluxToWrite( const HeatFluxType heatFluxType );
- void announceHeatFluxToRead( const HeatFluxType heatFluxType );
- */
-
- int getDimensions();
- // static int getMeshID( const std::string& meshName );
- //static void setMeshName( const std::string& meshName );
- //static int getDataID( const std::string& dataName, const int meshID );
-
- //static void writeInitialBlockScalarData( const int dataID,
- // const int size,
- // int* const valueIndices,
- // double* const values );
- //static void announceAllInitialDataWritten();
-
- bool hasToReadIterationCheckpoint();
- void announceIterationCheckpointRead();
- bool hasToWriteIterationCheckpoint();
- void announceIterationCheckpointWritten();
-
- bool hasToWriteInitialData();
- void announceInitialDataWritten();
-
- bool isInitialDataAvailable();
-
- void setMesh( const std::string& meshName,
- const size_t numPoints,
- std::vector<double>& coordinates,
- const std::vector<int>& dumuxFaceIDs ) ;
-
- double initialize();
- void initializeData();
- void finalize();
- //static void initializeData();
-
- double advance( const double computedTimeStepLength );
- bool isCouplingOngoing();
-
- size_t getNumberOfVertices();
-
-
- double getHeatFluxOnFace( const int faceID ) const;
- void writeHeatFluxOnFace( const int faceID, const double value );
-
- double getTemperatureOnFace( const int faceID ) const;
- void writeTemperatureOnFace( const int faceID, const double value );
-
- void writeHeatFluxToOtherSolver();
- void readHeatFluxFromOtherSolver();
-
- void writeTemperatureToOtherSolver();
- void readTemperatureFromOtherSolver();
-
-
- bool isCoupledEntity( const int faceID ) const;
-
-
-
-// std::vector<double>& getHeatFluxToWrite();
-
-// static void readScalarQuantitiy( const int dataID, std::vector<double>& data );
-// static void writeScalarQuantitiy( const int dataID, std::vector<double>& data );
-
-
- void print( std::ostream& os );
-
- /*
- static void writeSolidTemperature( std::vector<double>& temperature );
- static void readSolidTemperature( std::vector<double>& temperature );
- static void writeFluidTemperature( const std::vector<double>& temperature );
- static void readFluidTemperature( std::vector<double>& temperature );
- */
-
- /*
- static void readBlockScalarData( const int dataID,
- const int size,
- int* const valueIndices,
- double* const values );
-
- static void writeBlockScalarData( const int dataID,
- const int size,
- int* const valueIndices,
- double* const values );
- */
-
-};
-
-}
-#endif
--
GitLab