diff --git a/.gitignore b/.gitignore index b7f69be9..099e1fbc 100644 --- a/.gitignore +++ b/.gitignore @@ -36,8 +36,8 @@ # OpenFOAM / WMake lnInclude/ -Make/linux64GccDPInt32Opt/ -Make/darwin64ClangDPInt32Opt/ +Make/linux64*/ +Make/darwin64*/ # Editors .cproject diff --git a/Adapter.C b/Adapter.C index 7146b1c9..07ab0cff 100644 --- a/Adapter.C +++ b/Adapter.C @@ -1,9 +1,39 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #include "Adapter.H" #include "Interface.H" #include "Utilities.H" #include "IOstreams.H" #include +#include +#include using namespace Foam; @@ -39,16 +69,16 @@ bool preciceAdapter::Adapter::configFileRead() IOobject::NO_WRITE)); // Read and display the preCICE configuration file name - preciceConfigFilename_ = preciceDict.get("preciceConfig"); + preciceConfigFilename_ = static_cast(preciceDict.lookup("preciceConfig")); DEBUG(adapterInfo(" precice-config-file : " + preciceConfigFilename_)); // Read and display the participant name - participantName_ = preciceDict.get("participant"); + participantName_ = static_cast(preciceDict.lookup("participant")); DEBUG(adapterInfo(" participant name : " + participantName_)); // Read and display the list of modules DEBUG(adapterInfo(" modules requested : ")); - auto modules_ = preciceDict.get("modules"); + auto modules_ = static_cast(preciceDict.lookup("modules")); for (const auto& module : modules_) { DEBUG(adapterInfo(" - " + module + "\n")); @@ -58,12 +88,10 @@ bool preciceAdapter::Adapter::configFileRead() { CHTenabled_ = true; } - if (module == "FSI") { FSIenabled_ = true; } - if (module == "FF") { FFenabled_ = true; @@ -73,7 +101,7 @@ bool preciceAdapter::Adapter::configFileRead() // Every interface is a subdictionary of "interfaces", // each with an arbitrary name. Read all of them and create // a list (here: pointer) of dictionaries. - const auto* interfaceDictPtr = preciceDict.findDict("interfaces"); + const auto* interfaceDictPtr = preciceDict.subDictPtr("interfaces"); DEBUG(adapterInfo(" interfaces : ")); // Check if we found any interfaces @@ -92,7 +120,7 @@ bool preciceAdapter::Adapter::configFileRead() const dictionary& interfaceDict = interfaceDictEntry.dict(); struct InterfaceConfig interfaceConfig; - interfaceConfig.meshName = interfaceDict.get("mesh"); + interfaceConfig.meshName = static_cast(interfaceDict.lookup("mesh")); DEBUG(adapterInfo(" - mesh : " + interfaceConfig.meshName)); // By default, assume "faceCenters" as locationsType @@ -113,7 +141,7 @@ bool preciceAdapter::Adapter::configFileRead() DEBUG(adapterInfo(" connectivity : " + std::to_string(interfaceConfig.meshConnectivity))); DEBUG(adapterInfo(" patches : ")); - auto patches = interfaceDict.get("patches"); + auto patches = static_cast(interfaceDict.lookup("patches")); for (auto patch : patches) { interfaceConfig.patchNames.push_back(patch); @@ -139,7 +167,7 @@ bool preciceAdapter::Adapter::configFileRead() } DEBUG(adapterInfo(" writeData : ")); - auto writeData = interfaceDict.lookupOrDefault("writeData", wordList()); + auto writeData = static_cast(interfaceDict.lookupOrDefault("writeData", wordList())); for (auto writeDatum : writeData) { interfaceConfig.writeData.push_back(writeDatum); @@ -147,7 +175,7 @@ bool preciceAdapter::Adapter::configFileRead() } DEBUG(adapterInfo(" readData : ")); - auto readData = interfaceDict.lookupOrDefault("readData", wordList()); + auto readData = static_cast(interfaceDict.lookupOrDefault("readData", wordList())); for (auto readDatum : readData) { interfaceConfig.readData.push_back(readDatum); @@ -458,7 +486,7 @@ void preciceAdapter::Adapter::execute() { // Check if the time directory already exists // (i.e. the solver wrote results that need to be updated) - if (runTime_.timePath().type() == fileName::DIRECTORY) + if (runTime_.timePath().type() == fileType::directory) { adapterInfo( "The coupling timestep completed. " @@ -502,8 +530,7 @@ void preciceAdapter::Adapter::execute() return; } - -void preciceAdapter::Adapter::adjustTimeStep() +void preciceAdapter::Adapter::setTimeStep() { adjustSolverTimeStepAndReadData(); @@ -691,14 +718,9 @@ void preciceAdapter::Adapter::adjustSolverTimeStepAndReadData() // Update the solver's timestep (but don't trigger the adjustDeltaT(), // which also triggers the functionObject's adjustTimeStep()) // TODO: Keep this in mind if any relevant problem appears. - const_cast(runTime_).setDeltaT(timestepSolver_, false); - - DEBUG(adapterInfo("Reading coupling data associated to the calculated time-step size...")); + const_cast(runTime_).setDeltaTNoAdjust(timestepSolver_); - // Read the received coupling data from the buffer - // Fits to an implicit Euler readCouplingData(runTime_.deltaT().value()); - return; } @@ -800,6 +822,7 @@ void preciceAdapter::Adapter::reloadMeshPoints() // TODO // Switch oldpoints on for pure physics. (is this required?). Switch off for better mesh deformation capabilities? // const_cast(mesh_.points()) = oldMeshPoints_; + const_cast(mesh_).move(); const_cast(mesh_).movePoints(meshPoints_); DEBUG(adapterInfo("Moved mesh points to their previous locations.")); @@ -845,21 +868,27 @@ void preciceAdapter::Adapter::setupMeshVolCheckpointing() DEBUG(adapterInfo("Creating a list of the mesh volume checkpointed fields...")); // Add the V0 and the V00 to the list of checkpointed fields. // For V0 - addVolCheckpointField( - const_cast( - mesh_.V0())); + if (mesh_.foundObject("V0")) + { + addVolCheckpointField( + const_cast( + mesh_.V0())); #ifdef ADAPTER_DEBUG_MODE - adapterInfo( - "Added " + mesh_.V0().name() + " in the list of checkpointed fields."); + adapterInfo( + "Added " + mesh_.V0().name() + " in the list of checkpointed fields."); #endif + } // For V00 - addVolCheckpointField( - const_cast( - mesh_.V00())); + if (mesh_.foundObject("V00")) + { + addVolCheckpointField( + const_cast( + mesh_.V00())); #ifdef ADAPTER_DEBUG_MODE - adapterInfo( - "Added " + mesh_.V00().name() + " in the list of checkpointed fields."); + adapterInfo( + "Added " + mesh_.V00().name() + " in the list of checkpointed fields."); #endif + } // Also add the buffer fields. // TODO For V0 @@ -869,23 +898,24 @@ void preciceAdapter::Adapter::setupMeshVolCheckpointing() ( mesh_.V0() ) - ); */ + ); #ifdef ADAPTER_DEBUG_MODE adapterInfo( "Added " + mesh_.V0().name() + " in the list of buffer checkpointed fields."); #endif // TODO For V00 - /* addVolCheckpointFieldBuffer + addVolCheckpointFieldBuffer ( const_cast ( mesh_.V00() ) - );*/ + ); #ifdef ADAPTER_DEBUG_MODE adapterInfo( "Added " + mesh_.V00().name() + " in the list of buffer checkpointed fields."); #endif + */ } @@ -897,12 +927,16 @@ void preciceAdapter::Adapter::setupCheckpointing() DEBUG(adapterInfo("Adding in checkpointed fields...")); #undef doLocalCode -#define doLocalCode(GeomFieldType) \ - /* Checkpoint registered GeomFieldType objects */ \ - for (const word& obj : mesh_.sortedNames()) \ - { \ - addCheckpointField(mesh_.thisDb().getObjectPtr(obj)); \ - DEBUG(adapterInfo("Checkpoint " + obj + " : " #GeomFieldType)); \ +#define doLocalCode(GeomField) \ + /* Checkpoint registered GeomField objects */ \ + for (const word& obj : mesh_.lookupClass().sortedToc()) \ + { \ + /* do not checkpoint mesh files here! */ \ + if ((obj != "Cc") && (obj != "Cf") && (obj != "magSf") && (obj != "Sf")) \ + { \ + addCheckpointField(&(const_cast(mesh_.thisDb().lookupObject(obj)))); \ + DEBUG(adapterInfo("Checkpoint " + obj + " : " #GeomField)); \ + } \ } doLocalCode(volScalarField); @@ -941,7 +975,7 @@ void preciceAdapter::Adapter::pruneCheckpointedFields() toRemoveIndices.clear(); \ index = 0; \ /* Iterate through fields in OpenFOAM registry */ \ - for (const word& fieldName : mesh_.sortedNames()) \ + for (const word& fieldName : mesh_.lookupClass().sortedToc()) \ { \ regFields.push_back(fieldName); \ } \ @@ -949,9 +983,31 @@ void preciceAdapter::Adapter::pruneCheckpointedFields() for (GeomFieldType * fieldObj : GeomFieldCopies_) \ { \ fieldName = fieldObj->name(); \ - if (std::find(regFields.begin(), regFields.end(), fieldName) == regFields.end()) \ + DEBUG(adapterInfo("Search for " #GeomFieldType ":" + fieldName)); \ + { \ + std::ostringstream oss; \ + oss << (mesh_.thisDb().foundObject(fieldName) ? "true" : "false"); \ + DEBUG(adapterInfo(#GeomFieldType ":" + fieldName + "found: " + oss.str())); \ + } \ + auto regFieldPtr = std::find(regFields.begin(), regFields.end(), fieldName); \ + if ((regFieldPtr == regFields.end()) || !(mesh_.thisDb().foundObject(fieldName))) \ { \ toRemoveIndices.push_back(index); \ + DEBUG(adapterInfo("Remove " + fieldName)); \ + } \ + else \ + { \ + std::ostringstream oss; \ + oss << "old address: " << GeomField_.at(index) << "\n"; \ + /* update address, because OpenFOAM might have recreated the object */ \ + auto currentAddr = &(const_cast(mesh_.thisDb().lookupObject(fieldName))); \ + oss << "current address: " << currentAddr; \ + if (currentAddr != GeomField_.at(index)) \ + { \ + DEBUG(adapterInfo("Changed address!")); \ + DEBUG(adapterInfo(oss.str())); \ + } \ + GeomField_.at(index) = currentAddr; \ } \ index += 1; \ } \ @@ -1136,6 +1192,10 @@ void preciceAdapter::Adapter::readCheckpoint() reloadMeshPoints(); } + // Make sure that really all target fields for overwriting with checkpointed data still exists + // and use the correct address + pruneCheckpointedFields(); + // Reload all the fields of type volScalarField for (uint i = 0; i < volScalarFields_.size(); i++) { @@ -1147,11 +1207,11 @@ void preciceAdapter::Adapter::readCheckpoint() int nOldTimes(volScalarFields_.at(i)->nOldTimes()); if (nOldTimes >= 1) { - volScalarFields_.at(i)->oldTime() == volScalarFieldCopies_.at(i)->oldTime(); + volScalarFields_.at(i)->oldTimeRef() == volScalarFieldCopies_.at(i)->oldTime(); } if (nOldTimes == 2) { - volScalarFields_.at(i)->oldTime().oldTime() == volScalarFieldCopies_.at(i)->oldTime().oldTime(); + volScalarFields_.at(i)->oldTimeRef().oldTimeRef() == volScalarFieldCopies_.at(i)->oldTime().oldTime(); } } @@ -1164,11 +1224,11 @@ void preciceAdapter::Adapter::readCheckpoint() int nOldTimes(volVectorFields_.at(i)->nOldTimes()); if (nOldTimes >= 1) { - volVectorFields_.at(i)->oldTime() == volVectorFieldCopies_.at(i)->oldTime(); + volVectorFields_.at(i)->oldTimeRef() == volVectorFieldCopies_.at(i)->oldTime(); } if (nOldTimes == 2) { - volVectorFields_.at(i)->oldTime().oldTime() == volVectorFieldCopies_.at(i)->oldTime().oldTime(); + volVectorFields_.at(i)->oldTimeRef().oldTimeRef() == volVectorFieldCopies_.at(i)->oldTime().oldTime(); } } @@ -1180,11 +1240,11 @@ void preciceAdapter::Adapter::readCheckpoint() int nOldTimes(surfaceScalarFields_.at(i)->nOldTimes()); if (nOldTimes >= 1) { - surfaceScalarFields_.at(i)->oldTime() == surfaceScalarFieldCopies_.at(i)->oldTime(); + surfaceScalarFields_.at(i)->oldTimeRef() == surfaceScalarFieldCopies_.at(i)->oldTime(); } if (nOldTimes == 2) { - surfaceScalarFields_.at(i)->oldTime().oldTime() == surfaceScalarFieldCopies_.at(i)->oldTime().oldTime(); + surfaceScalarFields_.at(i)->oldTimeRef().oldTimeRef() == surfaceScalarFieldCopies_.at(i)->oldTime().oldTime(); } } @@ -1196,11 +1256,11 @@ void preciceAdapter::Adapter::readCheckpoint() int nOldTimes(surfaceVectorFields_.at(i)->nOldTimes()); if (nOldTimes >= 1) { - surfaceVectorFields_.at(i)->oldTime() == surfaceVectorFieldCopies_.at(i)->oldTime(); + surfaceVectorFields_.at(i)->oldTimeRef() == surfaceVectorFieldCopies_.at(i)->oldTime(); } if (nOldTimes == 2) { - surfaceVectorFields_.at(i)->oldTime().oldTime() == surfaceVectorFieldCopies_.at(i)->oldTime().oldTime(); + surfaceVectorFields_.at(i)->oldTimeRef().oldTimeRef() == surfaceVectorFieldCopies_.at(i)->oldTime().oldTime(); } } @@ -1212,11 +1272,11 @@ void preciceAdapter::Adapter::readCheckpoint() int nOldTimes(pointScalarFields_.at(i)->nOldTimes()); if (nOldTimes >= 1) { - pointScalarFields_.at(i)->oldTime() == pointScalarFieldCopies_.at(i)->oldTime(); + pointScalarFields_.at(i)->oldTimeRef() == pointScalarFieldCopies_.at(i)->oldTime(); } if (nOldTimes == 2) { - pointScalarFields_.at(i)->oldTime().oldTime() == pointScalarFieldCopies_.at(i)->oldTime().oldTime(); + pointScalarFields_.at(i)->oldTimeRef().oldTimeRef() == pointScalarFieldCopies_.at(i)->oldTime().oldTime(); } } @@ -1229,11 +1289,11 @@ void preciceAdapter::Adapter::readCheckpoint() int nOldTimes(pointVectorFields_.at(i)->nOldTimes()); if (nOldTimes >= 1) { - pointVectorFields_.at(i)->oldTime() == pointVectorFieldCopies_.at(i)->oldTime(); + pointVectorFields_.at(i)->oldTimeRef() == pointVectorFieldCopies_.at(i)->oldTime(); } if (nOldTimes == 2) { - pointVectorFields_.at(i)->oldTime().oldTime() == pointVectorFieldCopies_.at(i)->oldTime().oldTime(); + pointVectorFields_.at(i)->oldTimeRef().oldTimeRef() == pointVectorFieldCopies_.at(i)->oldTime().oldTime(); } } @@ -1246,11 +1306,11 @@ void preciceAdapter::Adapter::readCheckpoint() int nOldTimes(volTensorFields_.at(i)->nOldTimes()); if (nOldTimes >= 1) { - volTensorFields_.at(i)->oldTime() == volTensorFieldCopies_.at(i)->oldTime(); + volTensorFields_.at(i)->oldTimeRef() == volTensorFieldCopies_.at(i)->oldTime(); } if (nOldTimes == 2) { - volTensorFields_.at(i)->oldTime().oldTime() == volTensorFieldCopies_.at(i)->oldTime().oldTime(); + volTensorFields_.at(i)->oldTimeRef().oldTimeRef() == volTensorFieldCopies_.at(i)->oldTime().oldTime(); } } @@ -1262,11 +1322,11 @@ void preciceAdapter::Adapter::readCheckpoint() int nOldTimes(surfaceTensorFields_.at(i)->nOldTimes()); if (nOldTimes >= 1) { - surfaceTensorFields_.at(i)->oldTime() == surfaceTensorFieldCopies_.at(i)->oldTime(); + surfaceTensorFields_.at(i)->oldTimeRef() == surfaceTensorFieldCopies_.at(i)->oldTime(); } if (nOldTimes == 2) { - surfaceTensorFields_.at(i)->oldTime().oldTime() == surfaceTensorFieldCopies_.at(i)->oldTime().oldTime(); + surfaceTensorFields_.at(i)->oldTimeRef().oldTimeRef() == surfaceTensorFieldCopies_.at(i)->oldTime().oldTime(); } } @@ -1278,11 +1338,11 @@ void preciceAdapter::Adapter::readCheckpoint() int nOldTimes(pointTensorFields_.at(i)->nOldTimes()); if (nOldTimes >= 1) { - pointTensorFields_.at(i)->oldTime() == pointTensorFieldCopies_.at(i)->oldTime(); + pointTensorFields_.at(i)->oldTimeRef() == pointTensorFieldCopies_.at(i)->oldTime(); } if (nOldTimes == 2) { - pointTensorFields_.at(i)->oldTime().oldTime() == pointTensorFieldCopies_.at(i)->oldTime().oldTime(); + pointTensorFields_.at(i)->oldTimeRef().oldTimeRef() == pointTensorFieldCopies_.at(i)->oldTime().oldTime(); } } @@ -1295,11 +1355,11 @@ void preciceAdapter::Adapter::readCheckpoint() int nOldTimes(volSymmTensorFields_.at(i)->nOldTimes()); if (nOldTimes >= 1) { - volSymmTensorFields_.at(i)->oldTime() == volSymmTensorFieldCopies_.at(i)->oldTime(); + volSymmTensorFields_.at(i)->oldTimeRef() == volSymmTensorFieldCopies_.at(i)->oldTime(); } if (nOldTimes == 2) { - volSymmTensorFields_.at(i)->oldTime().oldTime() == volSymmTensorFieldCopies_.at(i)->oldTime().oldTime(); + volSymmTensorFields_.at(i)->oldTimeRef().oldTimeRef() == volSymmTensorFieldCopies_.at(i)->oldTime().oldTime(); } } @@ -1416,11 +1476,11 @@ void preciceAdapter::Adapter::readMeshCheckpoint() int nOldTimes(meshSurfaceScalarFields_.at(i)->nOldTimes()); if (nOldTimes >= 1) { - meshSurfaceScalarFields_.at(i)->oldTime() == meshSurfaceScalarFieldCopies_.at(i)->oldTime(); + meshSurfaceScalarFields_.at(i)->oldTimeRef() == meshSurfaceScalarFieldCopies_.at(i)->oldTime(); } if (nOldTimes == 2) { - meshSurfaceScalarFields_.at(i)->oldTime().oldTime() == meshSurfaceScalarFieldCopies_.at(i)->oldTime().oldTime(); + meshSurfaceScalarFields_.at(i)->oldTimeRef().oldTimeRef() == meshSurfaceScalarFieldCopies_.at(i)->oldTime().oldTime(); } } @@ -1433,11 +1493,11 @@ void preciceAdapter::Adapter::readMeshCheckpoint() int nOldTimes(meshSurfaceVectorFields_.at(i)->nOldTimes()); if (nOldTimes >= 1) { - meshSurfaceVectorFields_.at(i)->oldTime() == meshSurfaceVectorFieldCopies_.at(i)->oldTime(); + meshSurfaceVectorFields_.at(i)->oldTimeRef() == meshSurfaceVectorFieldCopies_.at(i)->oldTime(); } if (nOldTimes == 2) { - meshSurfaceVectorFields_.at(i)->oldTime().oldTime() == meshSurfaceVectorFieldCopies_.at(i)->oldTime().oldTime(); + meshSurfaceVectorFields_.at(i)->oldTimeRef().oldTimeRef() == meshSurfaceVectorFieldCopies_.at(i)->oldTime().oldTime(); } } @@ -1450,11 +1510,11 @@ void preciceAdapter::Adapter::readMeshCheckpoint() int nOldTimes(meshVolVectorFields_.at(i)->nOldTimes()); if (nOldTimes >= 1) { - meshVolVectorFields_.at(i)->oldTime() == meshVolVectorFieldCopies_.at(i)->oldTime(); + meshVolVectorFields_.at(i)->oldTimeRef() == meshVolVectorFieldCopies_.at(i)->oldTime(); } if (nOldTimes == 2) { - meshVolVectorFields_.at(i)->oldTime().oldTime() == meshVolVectorFieldCopies_.at(i)->oldTime().oldTime(); + meshVolVectorFields_.at(i)->oldTimeRef().oldTimeRef() == meshVolVectorFieldCopies_.at(i)->oldTime().oldTime(); } } diff --git a/Adapter.H b/Adapter.H index b82efa20..780ab465 100644 --- a/Adapter.H +++ b/Adapter.H @@ -1,3 +1,31 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef PRECICEADAPTER_H #define PRECICEADAPTER_H @@ -294,10 +322,9 @@ private: //- Configure the checkpointing void setupCheckpointing(); - //- Remove checkpointed fields which are not used by OpenFOAM anymore + //- Remove checkpointed fields which are not used by OpenFOAM anymore and update pointer void pruneCheckpointedFields(); - //- Make a copy of the runTime object void storeCheckpointTime(); @@ -312,53 +339,53 @@ private: // Add mesh checkpoint fields, depending on the type //- Add a surfaceScalarField mesh field - void addMeshCheckpointField(surfaceScalarField& field); + void addMeshCheckpointField(Foam::surfaceScalarField& field); //- Add a surfaceVectorField mesh field - void addMeshCheckpointField(surfaceVectorField& field); + void addMeshCheckpointField(Foam::surfaceVectorField& field); //- Add a volVectorField mesh field - void addMeshCheckpointField(volVectorField& field); + void addMeshCheckpointField(Foam::volVectorField& field); // TODO V0 and V00 checkpointed field. //- Add the V0 and V00 checkpoint fields - void addVolCheckpointField(volScalarField::Internal& field); - // void addVolCheckpointFieldBuffer(volScalarField::Internal & field); + void addVolCheckpointField(Foam::volScalarField::Internal& field); + // void addVolCheckpointFieldBuffer(Foam::volScalarField::Internal & field); // Add checkpoint fields, depending on the type //- Add a volScalarField to checkpoint - void addCheckpointField(volScalarField* field); + void addCheckpointField(Foam::volScalarField* field); //- Add a volVectorField to checkpoint - void addCheckpointField(volVectorField* field); + void addCheckpointField(Foam::volVectorField* field); //- Add a surfaceScalarField to checkpoint - void addCheckpointField(surfaceScalarField* field); + void addCheckpointField(Foam::surfaceScalarField* field); //- Add a surfaceVectorField to checkpoint - void addCheckpointField(surfaceVectorField* field); + void addCheckpointField(Foam::surfaceVectorField* field); //- Add a pointScalarField to checkpoint - void addCheckpointField(pointScalarField* field); + void addCheckpointField(Foam::pointScalarField* field); //- Add a pointVectorField to checkpoint - void addCheckpointField(pointVectorField* field); + void addCheckpointField(Foam::pointVectorField* field); // NOTE: Add here methods to add other object types to checkpoint, // if needed. //- Add a volTensorField to checkpoint - void addCheckpointField(volTensorField* field); + void addCheckpointField(Foam::volTensorField* field); //- Add a surfaceTensorField to checkpoint - void addCheckpointField(surfaceTensorField* field); + void addCheckpointField(Foam::surfaceTensorField* field); //- Add a pointTensorField to checkpoint - void addCheckpointField(pointTensorField* field); + void addCheckpointField(Foam::pointTensorField* field); //- Add a volSymmTensorField to checkpoint - void addCheckpointField(volSymmTensorField* field); + void addCheckpointField(Foam::volSymmTensorField* field); //- Read the checkpoint - restore the mesh fields and time void readMeshCheckpoint(); @@ -395,8 +422,9 @@ public: //- Called by the functionObject's execute() void execute(); - //- Called by the functionObject's adjustTimeStep() - void adjustTimeStep(); + //- Not called by OpenFOAM.org since OpenFOAM 9 + // See https://github.com/precice/openfoam-adapter/issues/261 + void setTimeStep(); //- Called by the functionObject's end() void end(); diff --git a/CHT/CHT.H b/CHT/CHT.H index bbda2fca..494077bf 100644 --- a/CHT/CHT.H +++ b/CHT/CHT.H @@ -1,3 +1,31 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef CHT_H #define CHT_H @@ -8,8 +36,6 @@ #include "CHT/SinkTemperature.H" #include "CHT/HeatTransferCoefficient.H" -#include "fvCFD.H" - namespace preciceAdapter { namespace CHT @@ -50,14 +76,14 @@ protected: std::string determineSolverType(); //- Read the CHT-related options from the adapter's configuration file - bool readConfig(const IOdictionary& adapterConfig); + bool readConfig(const Foam::IOdictionary& adapterConfig); public: //- Constructor ConjugateHeatTransfer(const Foam::fvMesh& mesh); //- Configure - bool configure(const IOdictionary& adapterConfig); + bool configure(const Foam::IOdictionary& adapterConfig); //- Add coupling data writers bool addWriters(std::string dataName, Interface* interface); diff --git a/CHT/HeatFlux.C b/CHT/HeatFlux.C index 7c63e290..49605083 100644 --- a/CHT/HeatFlux.C +++ b/CHT/HeatFlux.C @@ -1,7 +1,35 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #include "HeatFlux.H" #include "primitivePatchInterpolation.H" - -#include "fvCFD.H" +#include "volFields.H" +#include "fixedGradientFvPatchFields.H" using namespace Foam; @@ -160,7 +188,7 @@ preciceAdapter::CHT::HeatFlux_Incompressible::HeatFlux_Incompressible( const std::string namePr, const std::string nameAlphat) : HeatFlux(mesh, nameT), - Kappa_(new KappaEff_Incompressible(mesh, nameRho, nameCp, namePr, nameAlphat)) + Kappa_(new KappaEff_Incompressible(mesh)) { } diff --git a/CHT/HeatTransferCoefficient.C b/CHT/HeatTransferCoefficient.C index 68778280..564be63b 100644 --- a/CHT/HeatTransferCoefficient.C +++ b/CHT/HeatTransferCoefficient.C @@ -1,6 +1,33 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #include "HeatTransferCoefficient.H" -#include "fvCFD.H" #include "mixedFvPatchFields.H" #include "primitivePatchInterpolation.H" @@ -179,7 +206,7 @@ preciceAdapter::CHT::HeatTransferCoefficient_Incompressible:: const std::string namePr, const std::string nameAlphat) : HeatTransferCoefficient(mesh, nameT), - Kappa_(new KappaEff_Incompressible(mesh, nameRho, nameCp, namePr, nameAlphat)) + Kappa_(new KappaEff_Incompressible(mesh)) { } diff --git a/CHT/KappaEffective.C b/CHT/KappaEffective.C index 4ec5963a..d2ccd756 100644 --- a/CHT/KappaEffective.C +++ b/CHT/KappaEffective.C @@ -10,8 +10,8 @@ using namespace Foam; preciceAdapter::CHT::KappaEff_Compressible::KappaEff_Compressible( const Foam::fvMesh& mesh) : mesh_(mesh), - turbulence_( - mesh.lookupObject(turbulenceModel::propertiesName)) + thermophysicalTransportModel_( + mesh.lookupObject(thermophysicalTransportModel::typeName)) { DEBUG(adapterInfo("Constructed KappaEff_Compressible.")); } @@ -24,12 +24,12 @@ void preciceAdapter::CHT::KappaEff_Compressible::extract(uint patchID, bool mesh primitivePatchInterpolation patchInterpolator(mesh_.boundaryMesh()[patchID]); //Interpolate kappaEff_ from centers to nodes - kappaEff_ = patchInterpolator.faceToPointInterpolate(turbulence_.kappaEff()().boundaryField()[patchID]); + kappaEff_ = patchInterpolator.faceToPointInterpolate(thermophysicalTransportModel_.kappaEff()().boundaryField()[patchID]); } else { - // Extract kappaEff_ from the turbulence model - kappaEff_ = turbulence_.kappaEff()().boundaryField()[patchID]; + // Extract kappaEff_ from the thermophysical transport model + kappaEff_ = thermophysicalTransportModel_.kappaEff()().boundaryField()[patchID]; } } @@ -42,116 +42,28 @@ scalar preciceAdapter::CHT::KappaEff_Compressible::getAt(int i) //----- preciceAdapter::CHT::KappaEff_Incompressible ------------------ preciceAdapter::CHT::KappaEff_Incompressible::KappaEff_Incompressible( - const Foam::fvMesh& mesh, - const std::string nameRho, - const std::string nameCp, - const std::string namePr, - const std::string nameAlphat) + const Foam::fvMesh& mesh) : mesh_(mesh), - turbulence_( - mesh.lookupObject(turbulenceModel::propertiesName)), - nameRho_(nameRho), - nameCp_(nameCp), - namePr_(namePr), - nameAlphat_(nameAlphat) + thermophysicalTransportModel_( + mesh.lookupObject(thermophysicalTransportModel::typeName)) { DEBUG(adapterInfo("Constructed KappaEff_Incompressible.")); - DEBUG(adapterInfo(" Name of density: " + nameRho_)); - DEBUG(adapterInfo(" Name of heat capacity: " + nameCp_)); - DEBUG(adapterInfo(" Name of Prandl number: " + namePr_)); - DEBUG(adapterInfo(" Name of turbulent thermal diffusivity: " + nameAlphat_)); - - // Get the preciceDict/CHT dictionary - const dictionary& CHTDict = - mesh_.lookupObject("preciceDict").subOrEmptyDict("CHT"); - - // Read the Prandtl number - if (!CHTDict.readIfPresent(namePr_, Pr_)) - { - adapterInfo( - "Cannot find the Prandtl number in preciceDict/CHT using the name " + namePr_, - "error"); - } - else - { - DEBUG(adapterInfo(" Pr = " + std::to_string(Pr_.value()))); - } - - // Read the density - if (!CHTDict.readIfPresent(nameRho_, rho_)) - { - adapterInfo( - "Cannot find the density in preciceDict/CHT using the name " + nameRho_, - "error"); - } - else - { - DEBUG(adapterInfo(" rho = " + std::to_string(rho_.value()))); - } - - // Read the heat capacity - if (!CHTDict.readIfPresent(nameCp_, Cp_)) - { - adapterInfo( - "Cannot find the heat capacity in preciceDict/CHT using the name " + nameCp_, - "error"); - } - else - { - DEBUG(adapterInfo(" Cp = " + std::to_string(Cp_.value()))); - } } void preciceAdapter::CHT::KappaEff_Incompressible::extract(uint patchID, bool meshConnectivity) { - // Compute kappaEff_ from the turbulence model, using alpha and Prandl - - // Get the laminar viscosity from the turbulence model - // TODO: Do we really need turbulence at the end? - const scalarField& nu( - turbulence_.nu()().boundaryField()[patchID]); - - // Compute the effective thermal diffusivity - // (alphaEff = alpha + alphat = nu / Pr + nut / Prt) - - scalarField alphaEff; - - // Does the turbulent thermal diffusivity exist in the object registry? - if (mesh_.foundObject(nameAlphat_)) - { - const scalarField& alphat = - mesh_.lookupObject(nameAlphat_).boundaryField()[patchID]; - - alphaEff = nu / Pr_.value() + alphat; - } - else - { - WarningInFunction - << "The object alphat does not exist. " - << "An incompressible solver should create it explicitly " - << "(e.g. in the createFields.H)." - << "Assuming only the laminar part of the thermal diffusivity." - << nl; - - alphaEff = nu / Pr_.value(); - } - - // Compute the effective thermal conductivity and store it in a temp variable - scalarField kappaEff_temp( - alphaEff * rho_.value() * Cp_.value()); - if (meshConnectivity) { //Create an Interpolation object at the boundary Field primitivePatchInterpolation patchInterpolator(mesh_.boundaryMesh()[patchID]); - //Interpolate kappaEff_ from centers to nodes, if desired - kappaEff_ = patchInterpolator.faceToPointInterpolate(kappaEff_temp); + //Interpolate kappaEff_ from centers to nodes + kappaEff_ = patchInterpolator.faceToPointInterpolate(thermophysicalTransportModel_.kappaEff()().boundaryField()[patchID]); } else { - // if no interpolation - kappaEff_ = kappaEff_temp; + // Extract kappaEff_ from the thermophysical transport model + kappaEff_ = thermophysicalTransportModel_.kappaEff()().boundaryField()[patchID]; } } @@ -172,7 +84,7 @@ preciceAdapter::CHT::KappaEff_Basic::KappaEff_Basic( DEBUG(adapterInfo(" Name of conductivity: " + nameKappa_)); // Get the preciceDict/CHT dictionary - const dictionary& CHTDict = + const dictionary CHTDict = mesh_.lookupObject("preciceDict").subOrEmptyDict("CHT"); // Read the conductivity diff --git a/CHT/KappaEffective.H b/CHT/KappaEffective.H index 17cbf368..61974a91 100644 --- a/CHT/KappaEffective.H +++ b/CHT/KappaEffective.H @@ -1,8 +1,8 @@ #ifndef CHT_COMMON_KAPPAEFF_H #define CHT_COMMON_KAPPAEFF_H -#include "turbulentFluidThermoModel.H" -#include "turbulentTransportModel.H" +#include "momentumTransportModel.H" +#include "thermophysicalTransportModel.H" namespace preciceAdapter { @@ -21,9 +21,8 @@ protected: //- Effective conductivity (it can be different for each cell) Foam::scalarField kappaEff_; - //- Turbulence (and thermo/transport) model, from which - // kappaEff is drawn directly. - const Foam::compressible::turbulenceModel& turbulence_; + //- Thermophysical transport model, from which kappaEff is drawn directly. + const Foam::thermophysicalTransportModel& thermophysicalTransportModel_; public: //- Constructor @@ -48,40 +47,13 @@ protected: //- Effective conductivity (it can be different for each cell) Foam::scalarField kappaEff_; - //- Turbulence (and thermo/transport) model. - // The effective thermal diffusivity is drawn from it and - // used to compute the effective thermal conductivity. - const Foam::incompressible::turbulenceModel& turbulence_; - - //- Name of the user-provided density (in the preciceDict) - const std::string nameRho_; - - //- Name of the user-provided heat capacity (in the preciceDict) - const std::string nameCp_; - - //- Name of the user-provided Prandtl number (in the preciceDict) - const std::string namePr_; - - //- Name of the turbulent thermal diffusivity field - const std::string nameAlphat_; - - //- Density - Foam::dimensionedScalar rho_; - - //- Heat capacity - Foam::dimensionedScalar Cp_; - - //- Prandtl number - Foam::dimensionedScalar Pr_; + //- Thermophysical transport model, from which kappaEff is drawn directly. + const Foam::thermophysicalTransportModel& thermophysicalTransportModel_; public: //- Constructor KappaEff_Incompressible( - const Foam::fvMesh& mesh, - const std::string nameRho, - const std::string nameCp, - const std::string namePr, - const std::string nameAlphat); + const Foam::fvMesh& mesh); //- Extract the kappaEff on the specific patch and store it. void extract(uint patchID, bool meshConnectivity); diff --git a/CHT/SinkTemperature.H b/CHT/SinkTemperature.H index c22e5fc9..8301e910 100644 --- a/CHT/SinkTemperature.H +++ b/CHT/SinkTemperature.H @@ -1,9 +1,37 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef CHT_SINKTEMPERATURE_H #define CHT_SINKTEMPERATURE_H #include "CouplingDataUser.H" #include "mixedFvPatchFields.H" -#include "fvCFD.H" +#include "volFields.H" namespace preciceAdapter { diff --git a/CHT/Temperature.C b/CHT/Temperature.C index 3459e840..e9f6a7fc 100644 --- a/CHT/Temperature.C +++ b/CHT/Temperature.C @@ -1,6 +1,34 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #include "Temperature.H" #include "primitivePatchInterpolation.H" - +#include "volFields.H" using namespace Foam; @@ -90,7 +118,7 @@ void preciceAdapter::CHT::Temperature::read(double* buffer, const unsigned int d { if (cellSetNames_.empty()) { - for (auto& cell : T_->ref()) + for (auto& cell : T_->internalFieldRef()) { cell = buffer[bufferIndex++]; } @@ -105,7 +133,7 @@ void preciceAdapter::CHT::Temperature::read(double* buffer, const unsigned int d for (const auto& currentCell : cells) { // Copy temperature into the buffer - T_->ref()[currentCell] = buffer[bufferIndex++]; + T_->internalFieldRef()[currentCell] = buffer[bufferIndex++]; } } } diff --git a/CHT/Temperature.H b/CHT/Temperature.H index de1982e0..7a1a3b4d 100644 --- a/CHT/Temperature.H +++ b/CHT/Temperature.H @@ -1,9 +1,37 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef CHT_TEMPERATURE_H #define CHT_TEMPERATURE_H #include "CouplingDataUser.H" -#include "fvCFD.H" +#include "fvMesh.H" #include "cellSet.H" namespace preciceAdapter diff --git a/FF/Alpha.C b/FF/Alpha.C index f11d9c2e..75d8b2a8 100644 --- a/FF/Alpha.C +++ b/FF/Alpha.C @@ -1,3 +1,31 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #include "Alpha.H" using namespace Foam; @@ -65,7 +93,7 @@ void preciceAdapter::FF::Alpha::read(double* buffer, const unsigned int dim) { if (cellSetNames_.empty()) { - for (auto& cell : Alpha_->ref()) + for (auto& cell : Alpha_->internalFieldRef()) { cell = buffer[bufferIndex++]; } @@ -80,7 +108,7 @@ void preciceAdapter::FF::Alpha::read(double* buffer, const unsigned int dim) for (const auto& currentCell : cells) { // Copy the pressure into the buffer - Alpha_->ref()[currentCell] = buffer[bufferIndex++]; + Alpha_->internalFieldRef()[currentCell] = buffer[bufferIndex++]; } } } diff --git a/FF/Alpha.H b/FF/Alpha.H index faa0c9bf..1bd58442 100644 --- a/FF/Alpha.H +++ b/FF/Alpha.H @@ -1,9 +1,37 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef FF_ALPHA_H #define FF_ALPHA_H #include "CouplingDataUser.H" -#include "fvCFD.H" +#include "volFields.H" #include "cellSet.H" namespace preciceAdapter diff --git a/FF/AlphaGradient.H b/FF/AlphaGradient.H index 04905b7d..f79be051 100644 --- a/FF/AlphaGradient.H +++ b/FF/AlphaGradient.H @@ -1,9 +1,37 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef FF_ALPHA_GRADIENT_H #define FF_ALPHA_GRADIENT_H #include "CouplingDataUser.H" -#include "fvCFD.H" +#include "volFields.H" namespace preciceAdapter { diff --git a/FF/BoundaryConditions/coupledPressure/coupledPressureFvPatchField.C b/FF/BoundaryConditions/coupledPressure/coupledPressureFvPatchField.C index bdec7b37..3e28355d 100644 --- a/FF/BoundaryConditions/coupledPressure/coupledPressureFvPatchField.C +++ b/FF/BoundaryConditions/coupledPressure/coupledPressureFvPatchField.C @@ -1,3 +1,31 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #include "coupledPressureFvPatchField.H" #include "addToRunTimeSelectionTable.H" #include "surfaceFields.H" @@ -5,17 +33,6 @@ // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::coupledPressureFvPatchField::coupledPressureFvPatchField( - const fvPatch& p, - const DimensionedField& iF) -: fixedFluxExtrapolatedPressureFvPatchScalarField(p, iF), - refValue_(p.size(), Zero), - refGrad_(p.size(), Zero), - valueFraction_(p.size(), Zero) -{ -} - - Foam::coupledPressureFvPatchField::coupledPressureFvPatchField( const fvPatch& p, const DimensionedField& iF, @@ -24,8 +41,8 @@ Foam::coupledPressureFvPatchField::coupledPressureFvPatchField( : fixedFluxExtrapolatedPressureFvPatchScalarField(p, iF, dict), refValue_("refValue", dict, p.size()), valueFraction_(p.size(), Zero), - phiName_(dict.getOrDefault("phi", "phi")), - uName_(dict.getOrDefault("U", "U")) + phiName_(static_cast(dict.lookup("phi"))), + uName_(static_cast(dict.lookup("U"))) { if (dict.found("refGradient")) { @@ -42,42 +59,21 @@ Foam::coupledPressureFvPatchField::coupledPressureFvPatchField( const coupledPressureFvPatchField& ptf, const fvPatch& p, const DimensionedField& iF, - const fvPatchFieldMapper& mapper) + const fieldMapper& mapper) : fixedFluxExtrapolatedPressureFvPatchScalarField(ptf, p, iF, mapper), refValue_(ptf.refValue_), refGrad_(ptf.refGrad_), valueFraction_(ptf.valueFraction_) -{ - if (notNull(iF) && mapper.hasUnmapped()) - { - WarningInFunction - << "On field " << iF.name() << " patch " << p.name() - << " patchField " << this->type() - << " : mapper does not map all values." << nl - << " To avoid this warning fully specify the mapping in derived" - << " patch fields." << endl; - } -} - - -Foam::coupledPressureFvPatchField::coupledPressureFvPatchField( - const coupledPressureFvPatchField& ptf) -: fixedFluxExtrapolatedPressureFvPatchScalarField(ptf), - refValue_(ptf.refValue_), - refGrad_(ptf.refGrad_), - valueFraction_(ptf.valueFraction_) -{ -} - +{} Foam::coupledPressureFvPatchField::coupledPressureFvPatchField( const coupledPressureFvPatchField& ptf, const DimensionedField& iF) -: fixedFluxExtrapolatedPressureFvPatchScalarField(ptf, iF), - refValue_(ptf.refValue_), - refGrad_(ptf.refGrad_), - valueFraction_(ptf.valueFraction_) +: fixedFluxExtrapolatedPressureFvPatchScalarField(ptf, iF) { + this->refValue() = ptf.refValue_; + this->refGrad() = ptf.refGrad_; + this->valueFraction() = ptf.valueFraction_; } @@ -99,7 +95,7 @@ void Foam::coupledPressureFvPatchField::updateCoeffs() const scalarField& phip = phi->boundaryField()[this->patch().index()]; const Foam::volVectorField* U = &db().lookupObject(uName_); const vectorField& Up = U->boundaryField()[this->patch().index()]; - const vectorField n = this->patch().nf().cref(); + const vectorField n(this->patch().nf()); int t0 = this->patch().boundaryMesh().mesh().time().startTimeIndex(); int t = this->patch().boundaryMesh().mesh().time().timeIndex(); @@ -165,9 +161,9 @@ Foam::coupledPressureFvPatchField::gradientBoundaryCoeffs() const void Foam::coupledPressureFvPatchField::write(Ostream& os) const { fvPatchScalarField::write(os); - this->writeEntry("value", os); - this->valueFraction().writeEntry("valueFraction", os); - this->refValue().writeEntry("refValue", os); + writeEntry(os, "value", *this); + writeEntry(os, "valueFraction", this->valueFraction()); + writeEntry(os, "refValue", this->refValue()); } diff --git a/FF/BoundaryConditions/coupledPressure/coupledPressureFvPatchField.H b/FF/BoundaryConditions/coupledPressure/coupledPressureFvPatchField.H index da9f875a..136399e0 100644 --- a/FF/BoundaryConditions/coupledPressure/coupledPressureFvPatchField.H +++ b/FF/BoundaryConditions/coupledPressure/coupledPressureFvPatchField.H @@ -1,3 +1,31 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + /*---------------------------------------------------------------------------*\ Class Foam::coupledPressureFvPatchField @@ -71,11 +99,6 @@ public: // Constructors - //- Construct from patch and internal field - coupledPressureFvPatchField( - const fvPatch&, - const DimensionedField&); - //- Construct from patch, internal field and dictionary coupledPressureFvPatchField( const fvPatch&, @@ -89,18 +112,11 @@ public: const coupledPressureFvPatchField&, const fvPatch&, const DimensionedField&, - const fvPatchFieldMapper&); + const fieldMapper& mapper); - //- Construct as copy + //- Disallow copy without setting internal field reference coupledPressureFvPatchField( - const coupledPressureFvPatchField&); - - //- Construct and return a clone - virtual tmp clone() const - { - return tmp( - new coupledPressureFvPatchField(*this)); - } + const coupledPressureFvPatchField&) = delete; //- Construct as copy setting internal field reference coupledPressureFvPatchField( diff --git a/FF/BoundaryConditions/coupledVelocity/coupledVelocityFvPatchField.C b/FF/BoundaryConditions/coupledVelocity/coupledVelocityFvPatchField.C index b340d964..ea9761f3 100644 --- a/FF/BoundaryConditions/coupledVelocity/coupledVelocityFvPatchField.C +++ b/FF/BoundaryConditions/coupledVelocity/coupledVelocityFvPatchField.C @@ -1,3 +1,31 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #include "coupledVelocityFvPatchField.H" #include "dictionary.H" #include "addToRunTimeSelectionTable.H" @@ -24,7 +52,7 @@ Foam::coupledVelocityFvPatchField::coupledVelocityFvPatchField( : fvPatchField(p, iF), refValue_("refValue", dict, p.size()), valueFraction_(p.size(), Zero), - phiName_(dict.getOrDefault("phi", "phi")) + phiName_(static_cast(dict.lookup("phi"))) { if (dict.found("refGradient")) { @@ -48,32 +76,22 @@ Foam::coupledVelocityFvPatchField::coupledVelocityFvPatchField( const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper) -: fvPatchField(ptf, p, iF, mapper), - refValue_(ptf.refValue_), - refGrad_(ptf.refGrad_), - valueFraction_(ptf.valueFraction_) -{ -} - - -Foam::coupledVelocityFvPatchField::coupledVelocityFvPatchField( - const coupledVelocityFvPatchField& ptf) -: fvPatchField(ptf), - refValue_(ptf.refValue_), - refGrad_(ptf.refGrad_), - valueFraction_(ptf.valueFraction_) +: fvPatchField(ptf, p, iF, mapper) { + this->refValue() = ptf.refValue_; + this->refGrad() = ptf.refGrad_; + this->valueFraction() = ptf.valueFraction_; } Foam::coupledVelocityFvPatchField::coupledVelocityFvPatchField( const coupledVelocityFvPatchField& ptf, const DimensionedField& iF) -: fvPatchField(ptf, iF), - refValue_(ptf.refValue_), - refGrad_(ptf.refGrad_), - valueFraction_(ptf.valueFraction_) +: fvPatchField(ptf, iF) { + this->refValue() = ptf.refValue_; + this->refGrad() = ptf.refGrad_; + this->valueFraction() = ptf.valueFraction_; } @@ -95,7 +113,7 @@ void Foam::coupledVelocityFvPatchField::updateCoeffs() } const Foam::surfaceScalarField* phi = &db().lookupObject(phiName_); const scalarField& phip = phi->boundaryField()[this->patch().index()]; - const vectorField n = this->patch().nf().cref(); + const vectorField n(this->patch().nf()); int t0 = this->patch().boundaryMesh().mesh().time().startTimeIndex(); int t = this->patch().boundaryMesh().mesh().time().timeIndex(); @@ -162,9 +180,9 @@ Foam::coupledVelocityFvPatchField::gradientBoundaryCoeffs() const void Foam::coupledVelocityFvPatchField::write(Ostream& os) const { fvPatchField::write(os); - this->writeEntry("value", os); - this->valueFraction().writeEntry("valueFraction", os); - this->refValue().writeEntry("refValue", os); + writeEntry(os, "value", *this); + writeEntry(os, "valueFraction", this->valueFraction()); + writeEntry(os, "refValue", this->refValue()); } diff --git a/FF/BoundaryConditions/coupledVelocity/coupledVelocityFvPatchField.H b/FF/BoundaryConditions/coupledVelocity/coupledVelocityFvPatchField.H index dadc1f2f..c762db39 100644 --- a/FF/BoundaryConditions/coupledVelocity/coupledVelocityFvPatchField.H +++ b/FF/BoundaryConditions/coupledVelocity/coupledVelocityFvPatchField.H @@ -1,3 +1,31 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + /*---------------------------------------------------------------------------*\ Class Foam::coupledVelocityFvPatchField @@ -33,7 +61,7 @@ SourceFiles #define coupledVelocityFvPatchField_H #include "fvPatchFields.H" -#include "fvCFD.H" +#include "volFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -88,16 +116,9 @@ public: const DimensionedField&, const fvPatchFieldMapper&); - //- Construct as copy + //- Disallow copy without setting internal field reference coupledVelocityFvPatchField( - const coupledVelocityFvPatchField&); - - //- Construct and return a clone - virtual tmp clone() const - { - return tmp( - new coupledVelocityFvPatchField(*this)); - } + const coupledVelocityFvPatchField&) = delete; //- Construct as copy setting internal field reference coupledVelocityFvPatchField( diff --git a/FF/FF.H b/FF/FF.H index 77629442..571f8683 100644 --- a/FF/FF.H +++ b/FF/FF.H @@ -1,3 +1,31 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef FF_H #define FF_H @@ -13,8 +41,6 @@ #include "FF/AlphaGradient.H" #include "FF/Phi.H" -#include "fvCFD.H" - namespace preciceAdapter { namespace FF @@ -54,14 +80,14 @@ protected: std::string determineSolverType(); //- Read the FF-related options from the adapter's configuration file - bool readConfig(const IOdictionary& adapterConfig); + bool readConfig(const Foam::IOdictionary& adapterConfig); public: //- Constructor FluidFluid(const Foam::fvMesh& mesh); //- Configure - bool configure(const IOdictionary& adapterConfig); + bool configure(const Foam::IOdictionary& adapterConfig); //- Add coupling data writers bool addWriters(std::string dataName, Interface* interface); diff --git a/FF/Phi.H b/FF/Phi.H index a89f6515..2a53d163 100644 --- a/FF/Phi.H +++ b/FF/Phi.H @@ -1,9 +1,37 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef FF_PHI_H #define FF_PHI_H #include "CouplingDataUser.H" -#include "fvCFD.H" +#include "volFields.H" namespace preciceAdapter { diff --git a/FF/Pressure.C b/FF/Pressure.C index 5e8b94db..d81e1a86 100644 --- a/FF/Pressure.C +++ b/FF/Pressure.C @@ -1,3 +1,31 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #include "Pressure.H" #include "coupledPressureFvPatchField.H" @@ -66,7 +94,7 @@ void preciceAdapter::FF::Pressure::read(double* buffer, const unsigned int dim) { if (cellSetNames_.empty()) { - for (auto& cell : p_->ref()) + for (auto& cell : p_->internalFieldRef()) { cell = buffer[bufferIndex++]; } @@ -81,7 +109,7 @@ void preciceAdapter::FF::Pressure::read(double* buffer, const unsigned int dim) for (const auto& currentCell : cells) { // Copy the pressure into the buffer - p_->ref()[currentCell] = buffer[bufferIndex++]; + p_->internalFieldRef()[currentCell] = buffer[bufferIndex++]; } } } diff --git a/FF/Pressure.H b/FF/Pressure.H index 67f82b8f..64daf4ef 100644 --- a/FF/Pressure.H +++ b/FF/Pressure.H @@ -1,9 +1,37 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef FF_PRESSURE_H #define FF_PRESSURE_H #include "CouplingDataUser.H" -#include "fvCFD.H" +#include "volFields.H" #include "cellSet.H" namespace preciceAdapter diff --git a/FF/PressureGradient.H b/FF/PressureGradient.H index 27b8b03f..c8daaa5d 100644 --- a/FF/PressureGradient.H +++ b/FF/PressureGradient.H @@ -1,9 +1,37 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef FF_PRESSURE_GRADIENT_H #define FF_PRESSURE_GRADIENT_H #include "CouplingDataUser.H" -#include "fvCFD.H" +#include "volFields.H" namespace preciceAdapter { diff --git a/FF/Temperature.H b/FF/Temperature.H index 3e6ef322..a9507693 100644 --- a/FF/Temperature.H +++ b/FF/Temperature.H @@ -1,9 +1,37 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef FF_TEMPERATURE_H #define FF_TEMPERATURE_H #include "CouplingDataUser.H" -#include "fvCFD.H" +#include "volFields.H" namespace preciceAdapter { diff --git a/FF/TemperatureGradient.H b/FF/TemperatureGradient.H index 58c2e4d0..f4c34c27 100644 --- a/FF/TemperatureGradient.H +++ b/FF/TemperatureGradient.H @@ -1,9 +1,37 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef FF_TEMPERATURE_GRADIENT_H #define FF_TEMPERATURE_GRADIENT_H #include "CouplingDataUser.H" -#include "fvCFD.H" +#include "volFields.H" namespace preciceAdapter { diff --git a/FF/Velocity.C b/FF/Velocity.C index 18470d73..28692d1c 100644 --- a/FF/Velocity.C +++ b/FF/Velocity.C @@ -1,3 +1,31 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #include "Velocity.H" #include "coupledVelocityFvPatchField.H" @@ -24,7 +52,7 @@ preciceAdapter::FF::Velocity::Velocity( U_ = new volVectorField( IOobject( nameU, - mesh.time().timeName(), + mesh.time().name(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE), @@ -92,7 +120,7 @@ std::size_t preciceAdapter::FF::Velocity::write(double* buffer, bool meshConnect if (fluxCorrection_) { scalarField phip = phi_->boundaryFieldRef()[patchID]; - const vectorField n = U_->boundaryField()[patchID].patch().nf().cref(); + const vectorField n(U_->boundaryField()[patchID].patch().nf()); const scalarField& magS = U_->boundaryFieldRef()[patchID].patch().magSf(); UPatch = UPatch - n * (n & U_->boundaryField()[patchID]) + n * phip / magS; } @@ -128,7 +156,7 @@ void preciceAdapter::FF::Velocity::read(double* buffer, const unsigned int dim) { if (cellSetNames_.empty()) { - for (auto& cell : U_->ref()) + for (auto& cell : U_->internalFieldRef()) { // x-dimension cell.x() = buffer[bufferIndex++]; @@ -153,15 +181,15 @@ void preciceAdapter::FF::Velocity::read(double* buffer, const unsigned int dim) for (const auto& currentCell : cells) { // x-dimension - U_->ref()[currentCell].x() = buffer[bufferIndex++]; + U_->internalFieldRef()[currentCell].x() = buffer[bufferIndex++]; // y-dimension - U_->ref()[currentCell].y() = buffer[bufferIndex++]; + U_->internalFieldRef()[currentCell].y() = buffer[bufferIndex++]; if (dim == 3) { // z-dimension - U_->ref()[currentCell].z() = buffer[bufferIndex++]; + U_->internalFieldRef()[currentCell].z() = buffer[bufferIndex++]; } } } diff --git a/FF/Velocity.H b/FF/Velocity.H index a610ea56..20d0dea1 100644 --- a/FF/Velocity.H +++ b/FF/Velocity.H @@ -1,9 +1,37 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef FF_VELOCITY_H #define FF_VELOCITY_H #include "CouplingDataUser.H" -#include "fvCFD.H" +#include "volFields.H" #include "cellSet.H" namespace preciceAdapter diff --git a/FF/VelocityGradient.C b/FF/VelocityGradient.C index 90c685a7..ea0de13f 100644 --- a/FF/VelocityGradient.C +++ b/FF/VelocityGradient.C @@ -1,5 +1,34 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #include "VelocityGradient.H" #include "coupledVelocityFvPatchField.H" +#include "fixedGradientFvPatchFields.H" using namespace Foam; diff --git a/FF/VelocityGradient.H b/FF/VelocityGradient.H index 77430aeb..5c53aa78 100644 --- a/FF/VelocityGradient.H +++ b/FF/VelocityGradient.H @@ -1,9 +1,37 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef FF_VELOCITY_GRADIENT_H #define FF_VELOCITY_GRADIENT_H #include "CouplingDataUser.H" -#include "fvCFD.H" +#include "volFields.H" namespace preciceAdapter { diff --git a/FSI/Displacement.H b/FSI/Displacement.H index 4339a29b..072a7565 100644 --- a/FSI/Displacement.H +++ b/FSI/Displacement.H @@ -1,9 +1,37 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef FSI_DISPLACEMENT_H #define FSI_DISPLACEMENT_H #include "CouplingDataUser.H" -#include "fvCFD.H" +#include "volFields.H" #include "fixedValuePointPatchFields.H" #include "primitivePatchInterpolation.H" diff --git a/FSI/DisplacementDelta.H b/FSI/DisplacementDelta.H index b817618c..bff48eda 100644 --- a/FSI/DisplacementDelta.H +++ b/FSI/DisplacementDelta.H @@ -1,9 +1,37 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef FSI_DISPLACEMENTDELTA_H #define FSI_DISPLACEMENTDELTA_H #include "CouplingDataUser.H" -#include "fvCFD.H" +#include "volFields.H" #include "fixedValuePointPatchFields.H" #include "primitivePatchInterpolation.H" diff --git a/FSI/FSI.H b/FSI/FSI.H index 52d948fa..4ee70138 100644 --- a/FSI/FSI.H +++ b/FSI/FSI.H @@ -1,3 +1,31 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef FSI_H #define FSI_H @@ -8,7 +36,8 @@ #include "FSI/Force.H" #include "FSI/Stress.H" -#include "fvCFD.H" +#include "volFields.H" +#include "IOdictionary.H" namespace preciceAdapter { @@ -51,7 +80,7 @@ protected: std::string determineSolverType(); //- Read the FSI-related options from the adapter's configuration file - bool readConfig(const IOdictionary& adapterConfig); + bool readConfig(const Foam::IOdictionary& adapterConfig); public: //- Constructor @@ -59,7 +88,7 @@ public: FluidStructureInteraction(const Foam::fvMesh& mesh, const Foam::Time& runTime); //- Configure - bool configure(const IOdictionary& adapterConfig); + bool configure(const Foam::IOdictionary& adapterConfig); //- Add coupling data writers bool addWriters(std::string dataName, Interface* interface); diff --git a/FSI/Force.C b/FSI/Force.C index d8cbad39..063c382e 100644 --- a/FSI/Force.C +++ b/FSI/Force.C @@ -1,3 +1,31 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #include "Force.H" using namespace Foam; @@ -22,7 +50,7 @@ preciceAdapter::FSI::Force::Force( ForceOwning_.reset(new volVectorField( IOobject( nameForce, - mesh_.time().timeName(), + mesh_.time().name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE), @@ -32,7 +60,7 @@ preciceAdapter::FSI::Force::Force( dimensionSet(1, 1, -2, 0, 0, 0, 0), Foam::vector::zero))); - Force_ = ForceOwning_.get(); + Force_ = ForceOwning_.ptr(); } } @@ -86,9 +114,3 @@ std::string preciceAdapter::FSI::Force::getDataName() const { return "Force"; } - -Foam::tmp preciceAdapter::FSI::Force::getFaceVectors(const unsigned int patchID) const -{ - // Normal vectors multiplied by face area - return mesh_.boundary()[patchID].Sf(); -} diff --git a/FSI/Force.H b/FSI/Force.H index 9e763c10..3f7da4aa 100644 --- a/FSI/Force.H +++ b/FSI/Force.H @@ -1,3 +1,31 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef FSI_FORCE_H #define FSI_FORCE_H @@ -16,7 +44,7 @@ private: Foam::volVectorField* Force_; //- Force field (owning pointer, we bind to Force_) - std::unique_ptr ForceOwning_; + Foam::autoPtr ForceOwning_; public: //- Constructor @@ -35,9 +63,6 @@ public: //- Get the name of the current data field std::string getDataName() const final; - - //- Returns the normal vectors multiplied by the face area - Foam::tmp getFaceVectors(const unsigned int patchID) const final; }; } diff --git a/FSI/ForceBase.C b/FSI/ForceBase.C index 48297cdf..0173a8e7 100644 --- a/FSI/ForceBase.C +++ b/FSI/ForceBase.C @@ -1,4 +1,34 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #include "ForceBase.H" +#include "fluidThermo.H" +#include "surfaceInterpolate.H" using namespace Foam; @@ -24,33 +54,33 @@ preciceAdapter::FSI::ForceBase::ForceBase( } // Calculate viscous force -Foam::tmp preciceAdapter::FSI::ForceBase::devRhoReff() const +Foam::tmp preciceAdapter::FSI::ForceBase::devTau() const { - // For turbulent flows - typedef compressible::turbulenceModel cmpTurbModel; - typedef incompressible::turbulenceModel icoTurbModel; + //For turbulent flows + typedef compressibleMomentumTransportModel cmpTurbModel; + typedef incompressibleMomentumTransportModel icoTurbModel; - if (mesh_.foundObject(cmpTurbModel::propertiesName)) + if (mesh_.foundObject(cmpTurbModel::typeName)) { - const cmpTurbModel& turb( - mesh_.lookupObject(cmpTurbModel::propertiesName)); + const cmpTurbModel& turb = + mesh_.lookupObject(cmpTurbModel::typeName); - return turb.devRhoReff(); + return turb.devTau(); } - else if (mesh_.foundObject(icoTurbModel::propertiesName)) + else if (mesh_.foundObject(icoTurbModel::typeName)) { - const incompressible::turbulenceModel& turb( - mesh_.lookupObject(icoTurbModel::propertiesName)); + const icoTurbModel& turb = + mesh_.lookupObject(icoTurbModel::typeName); - return rho() * turb.devReff(); + return fvc::interpolate(rho()) * turb.devSigma(); } else { - // For laminar flows get the velocity - const volVectorField& U( - mesh_.lookupObject("U")); + FatalErrorInFunction + << "No valid model for viscous stress calculation" + << exit(FatalError); - return -mu() * dev(twoSymm(fvc::grad(U))); + return surfaceVectorField::null(); } } @@ -73,12 +103,12 @@ Foam::tmp preciceAdapter::FSI::ForceBase::rho() const new volScalarField( IOobject( "rho", - mesh_.time().timeName(), + mesh_.time().name(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE), mesh_, - dimensionedScalar(FSIDict.get("rho")))); + dimensionedScalar(static_cast(FSIDict.lookup("rho"))))); } else { @@ -95,13 +125,12 @@ Foam::tmp preciceAdapter::FSI::ForceBase::mu() const { if (solverType_.compare("incompressible") == 0) { - typedef immiscibleIncompressibleTwoPhaseMixture iitpMixture; - if (mesh_.foundObject("mixture")) + if (mesh_.foundObject(physicalProperties::typeName)) { - const iitpMixture& mixture( - mesh_.lookupObject("mixture")); + const fluidThermo& thermo = + mesh_.lookupObject(physicalProperties::typeName); - return mixture.mu(); + return thermo.mu(); } else { @@ -109,7 +138,7 @@ Foam::tmp preciceAdapter::FSI::ForceBase::mu() const const dictionary& FSIDict = mesh_.lookupObject("preciceDict").subOrEmptyDict("FSI"); - dimensionedScalar nu(FSIDict.get("nu")); + dimensionedScalar nu(static_cast(FSIDict.lookup("nu"))); return tmp( new volScalarField( @@ -136,9 +165,8 @@ std::size_t preciceAdapter::FSI::ForceBase::writeToBuffer(double* buffer, { // Compute forces. See the Forces function object. // Stress tensor boundary field - tmp tdevRhoReff(devRhoReff()); - const volSymmTensorField::Boundary& devRhoReffb( - tdevRhoReff().boundaryField()); + tmp tdevTau = devTau(); + const surfaceVectorField::Boundary& devTaub = tdevTau().boundaryField(); // Density boundary field tmp trho(rho()); @@ -150,22 +178,25 @@ std::size_t preciceAdapter::FSI::ForceBase::writeToBuffer(double* buffer, int bufferIndex = 0; // For every boundary patch of the interface + const surfaceVectorField::Boundary& Sfb = + mesh_.Sf().boundaryField(); + + const surfaceScalarField::Boundary& magSfb = + mesh_.magSf().boundaryField(); + for (const label patchID : patchIDs_) { - tmp tsurface = getFaceVectors(patchID); - const auto& surface = tsurface(); - // Pressure forces // FIXME: We need to subtract the reference pressure for incompressible calculations if (solverType_.compare("incompressible") == 0) { forceField.boundaryFieldRef()[patchID] = - surface * pb[patchID] * rhob[patchID]; + Sfb[patchID] * pb[patchID] * rhob[patchID]; } else if (solverType_.compare("compressible") == 0) { forceField.boundaryFieldRef()[patchID] = - surface * pb[patchID]; + Sfb[patchID] * pb[patchID]; } else { @@ -177,7 +208,7 @@ std::size_t preciceAdapter::FSI::ForceBase::writeToBuffer(double* buffer, // Viscous forces forceField.boundaryFieldRef()[patchID] += - surface & devRhoReffb[patchID]; + magSfb[patchID] * devTaub[patchID]; // Write the forces to the preCICE buffer // For every cell of the patch diff --git a/FSI/ForceBase.H b/FSI/ForceBase.H index 2c53086a..38049535 100644 --- a/FSI/ForceBase.H +++ b/FSI/ForceBase.H @@ -1,16 +1,43 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef FORCEBASE_H #define FORCEBASE_H #include "CouplingDataUser.H" -#include "fvCFD.H" +#include "volFields.H" #include "pointFields.H" #include "vectorField.H" -#include "immiscibleIncompressibleTwoPhaseMixture.H" -#include "turbulentFluidThermoModel.H" -#include "turbulentTransportModel.H" +#include "compressibleMomentumTransportModel.H" +#include "incompressibleMomentumTransportModel.H" namespace preciceAdapter { @@ -22,7 +49,7 @@ class ForceBase : public CouplingDataUser { protected: //- Stress tensor (see the OpenFOAM "Forces" function object) - Foam::tmp devRhoReff() const; + Foam::tmp devTau() const; Foam::tmp rho() const; @@ -44,8 +71,6 @@ public: const unsigned int dim) const; void readFromBuffer(double* buffer) const; - - virtual Foam::tmp getFaceVectors(const unsigned int patchID) const = 0; }; } } diff --git a/FSI/Stress.C b/FSI/Stress.C index 1194a249..078d59fc 100644 --- a/FSI/Stress.C +++ b/FSI/Stress.C @@ -1,3 +1,31 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #include "Stress.H" using namespace Foam; @@ -10,7 +38,7 @@ preciceAdapter::FSI::Stress::Stress( Stress_ = new volVectorField( IOobject( "Stress", - mesh_.time().timeName(), + mesh_.time().name(), mesh, IOobject::NO_READ, IOobject::AUTO_WRITE), @@ -41,12 +69,6 @@ std::string preciceAdapter::FSI::Stress::getDataName() const return "Stress"; } -Foam::tmp preciceAdapter::FSI::Stress::getFaceVectors(const unsigned int patchID) const -{ - // face normal vectors - return mesh_.boundary()[patchID].nf(); -} - preciceAdapter::FSI::Stress::~Stress() { delete Stress_; diff --git a/FSI/Stress.H b/FSI/Stress.H index 331100b4..a9188ef2 100644 --- a/FSI/Stress.H +++ b/FSI/Stress.H @@ -1,3 +1,31 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef FSI_STRESS_H #define FSI_STRESS_H @@ -37,9 +65,6 @@ public: //- Get the name of the current data field std::string getDataName() const final; - //- Returns the face normal vectors (no multiplication by area) - Foam::tmp getFaceVectors(const unsigned int patchID) const final; - //- Destructor ~Stress(); }; diff --git a/Interface.C b/Interface.C index 6db28eb3..a6a9369c 100644 --- a/Interface.C +++ b/Interface.C @@ -1,11 +1,39 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #include #include #include "Interface.H" #include "Utilities.H" -#include "faceTriangulation.H" +#include "polygonTriangulate.H" #include "cellSet.H" - +#include using namespace Foam; @@ -62,7 +90,7 @@ preciceAdapter::Interface::Interface( for (uint j = 0; j < patchNames.size(); j++) { // Get the patchID - int patchID = mesh.boundaryMesh().findPatchID(patchNames.at(j)); + int patchID = mesh.boundaryMesh().findIndex(patchNames.at(j)); // Throw an error if the patch was not found if (patchID == -1) @@ -220,6 +248,9 @@ void preciceAdapter::Interface::configureMesh(const fvMesh& mesh, const std::str // Map between OpenFOAM vertices and preCICE vertex IDs std::map, int> verticesMap; + // Triangulation engine + polygonTriangulate triEngine; + // Get the locations of the mesh vertices (here: face nodes) // for all the patches for (uint j = 0; j < patchIDs_.size(); j++) @@ -306,8 +337,7 @@ void preciceAdapter::Interface::configureMesh(const fvMesh& mesh, const std::str { const face& faceQuad = faceField[facei]; - // Triangulate the face - faceTriangulation faceTri(pointCoords, faceQuad, false); + triEngine.triangulate(UIndirectList(pointCoords, faceQuad)); // Iterate over all triangles generated out of each (quad) face for (uint triIndex = 0; triIndex < triaPerQuad; triIndex++) @@ -315,7 +345,7 @@ void preciceAdapter::Interface::configureMesh(const fvMesh& mesh, const std::str // Get the vertex that corresponds to the x,y,z coordinates of each node of a triangle for (uint nodeIndex = 0; nodeIndex < nodesPerTria; nodeIndex++) { - triVertIDs.push_back(verticesMap.at(std::make_tuple(pointCoords[faceTri[triIndex][nodeIndex]][0], pointCoords[faceTri[triIndex][nodeIndex]][1], pointCoords[faceTri[triIndex][nodeIndex]][2]))); + triVertIDs.push_back(verticesMap.at(std::make_tuple(pointCoords[triEngine.triPoints()[triIndex][nodeIndex]][0], pointCoords[triEngine.triPoints()[triIndex][nodeIndex]][1], pointCoords[triEngine.triPoints()[triIndex][nodeIndex]][2]))); } } } diff --git a/Interface.H b/Interface.H index 885ec9b0..7aa2455f 100644 --- a/Interface.H +++ b/Interface.H @@ -1,9 +1,40 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + #ifndef INTERFACE_H #define INTERFACE_H #include #include -#include "fvCFD.H" +#include "surfaceFields.H" +#include "argList.H" +#include "timeSelector.H" +#include "findRefCell.H" #include "CouplingDataUser.H" #include diff --git a/Make/options b/Make/options index af0f6292..4c9c0492 100644 --- a/Make/options +++ b/Make/options @@ -1,16 +1,12 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/transportModels/ \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ $(ADAPTER_PKG_CONFIG_CFLAGS) \ -I../ \ @@ -19,8 +15,11 @@ EXE_INC = \ LIB_LIBS = \ -lfiniteVolume \ -lmeshTools \ - -lcompressibleTurbulenceModels \ - -lincompressibleTurbulenceModels \ - -limmiscibleIncompressibleTwoPhaseMixture \ + -lphysicalProperties \ + -lfluidThermophysicalModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ + -lthermophysicalTransportModel \ $(ADAPTER_PKG_CONFIG_LIBS) \ -lprecice diff --git a/The GNU General Public License v3.0 - GNU Project with Terms by GRS.txt b/The GNU General Public License v3.0 - GNU Project with Terms by GRS.txt new file mode 100755 index 00000000..c8819bb9 --- /dev/null +++ b/The GNU General Public License v3.0 - GNU Project with Terms by GRS.txt @@ -0,0 +1,140 @@ +GNU GENERAL PUBLIC LICENSE +Version 3, 29 June 2007 +Copyright © 2007 Free Software Foundation, Inc. +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. +Preamble +The GNU General Public License is a free, copyleft license for software and other kinds of works. +The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. +To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. +For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. +Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. +For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. +Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. +Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. +The precise terms and conditions for copying, distribution and modification follow. +TERMS AND CONDITIONS +0. Definitions. +“This License” refers to version 3 of the GNU General Public License. +“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. +“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations. +To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work. +A “covered work” means either the unmodified Program or a work based on the Program. +To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. +To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. +An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. +1. Source Code. +The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work. +A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. +The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. +The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. +The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. +The Corresponding Source for a work in source code form is that same work. +2. Basic Permissions. +All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. +You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. +Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. +3. Protecting Users' Legal Rights From Anti-Circumvention Law. +No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. +When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. +4. Conveying Verbatim Copies. +You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. +You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. +5. Conveying Modified Source Versions. +You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: +a) The work must carry prominent notices stating that you modified it, and giving a relevant date. +b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”. +c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. +d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. +A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. +6. Conveying Non-Source Forms. +You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: +a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. +b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. +c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. +d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. +e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. +A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. +A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. +“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. +If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). +The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. +Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. +7. Additional Terms. +“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. +When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. +Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: +a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or +b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or +c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or +d) Limiting the use for publicity purposes of names of licensors or authors of the material; or +e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or +f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. +All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. +If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. +Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. +8. Termination. +You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). +However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. +Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. +Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. +9. Acceptance Not Required for Having Copies. +You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. +10. Automatic Licensing of Downstream Recipients. +Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. +An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. +You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. +11. Patents. +A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”. +A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. +Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. +In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. +If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. +If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. +A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. +Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. +12. No Surrender of Others' Freedom. +If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. +13. Use with the GNU Affero General Public License. +Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. +14. Revised Versions of this License. +The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. +Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. +If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. +Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. +15. Disclaimer of Warranty. +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. +16. Limitation of Liability. +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +17. Interpretation of Sections 15 and 16. +If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. +END OF TERMS AND CONDITIONS + + +ADDITIONAL TERMS AND CONDITIONS FOR MODIFIED CODE +Version 1, 18 November 2021 +© GRS gGmbH (www.grs.de) + + + +Pursuant to section 7 paragraph 3 items a), b) and f) of GNU GPL version 3 or respective provisions of an updated version of the GNU GPL, the following additional terms and conditions apply to modified code conveyed to you or third parties and shall be interpreted pursuant to section 17, if section 16 of GNU GPL version 3 should be invalid or unenforceable in the jurisdiction of the receiving party. +1. “Modified code” shall be understood as a code modified in the sense of section 7, paragraph 2, of the GNU GPL version 3, as well as any other code chosen to be subjected to these terms by the licensor or author (legal or natural person). + +2. Liability +The licensor or author of a modified version under this license, which is conveyed to you or third parties pursuant to section 5 or section 6 of GNU GPL version 3, shall only be liable for intent and gross negligence. +Insofar as the licensor or author is liable for gross negligence, he shall be liable without limitation for damages +(a) resulting from injury to life, limb or health, +(b) due to the absence or loss of a warranted quality or non-compliance with a guarantee, +(c) pursuant to the Product Liability Act of the Federal Republic of Germany. +The licensor or author shall only be liable for other damages due to gross negligence up to the amount of the foreseeable damage typical for this type of agreement. +In the event of data loss caused by gross negligence, the licensor or author shall only be liable for the damage that would have been caused even if the data had been backed up by you in a proper and regular manner commensurate with the importance of the data; this limitation shall not apply if data backup was impeded or impossible for reasons attributable to the Author. +3. Nuclear liability +The provision under section 2 of these Additional Terms for Modified Code shall not apply in the event of a nuclear incident within the meaning of a nuclear liability convention leading to damage. This shall exclusively be governed by the applicable Nuclear Liability Convention. Due to the respective channeling of liability, the licensor’s or author’s liability shall be excluded in such a case, irrespective of the causal contribution and the degree of fault. +With regard to compensation for nuclear damage, the following shall apply additionally: +(a) The licensor or author shall not be liable for nuclear damage caused to your or third parties’ property. +(b) You and third parties shall have no recourse to the licensor or in connection with nuclear damage. +(c) If claims are made against the licensor or author by third parties for compensation for nuclear damage, you shall release the licensor or author from any liability upon first request. This obligation shall apply irrespective of the country in which the causing event or damage occurred or the claim for damages is asserted. +4. Indemnification +You shall indemnify the licensor or author from and against any third-party claims which have arisen or will arise as a result of the unauthorised use of the modified code by yourself or by third parties. +You shall further indemnify the licensor or author from and against any third-party claims which have arisen or will arise as a result of the authorised use of the modified code insofar as the claims or damages which have arisen or will arise are based on slightly negligent conduct on the part of the licensor or author. +End of Terms diff --git a/changelog-entries/180.md b/changelog-entries/180.md new file mode 100644 index 00000000..1cb3e9fe --- /dev/null +++ b/changelog-entries/180.md @@ -0,0 +1 @@ +Disabled execute at start for OpenFOAM8 (PR #180, issue #179) diff --git a/preciceAdapterFunctionObject.C b/preciceAdapterFunctionObject.C index 92a4cd4e..91a76687 100644 --- a/preciceAdapterFunctionObject.C +++ b/preciceAdapterFunctionObject.C @@ -23,6 +23,7 @@ License \*---------------------------------------------------------------------------*/ #include "preciceAdapterFunctionObject.H" +#include "Utilities.H" // OpenFOAM header files #include "Time.H" @@ -85,6 +86,10 @@ bool Foam::functionObjects::preciceAdapterFunctionObject::read(const dictionary& clock.update(); #endif + // We disable executeAtStart explicitly here and don't read the respective entry from the dictionary(fvMeshFunctionObject::read(dict)). Have a look at issue #179 for the rationale. + this->executeAtStart_ = false; + DEBUG(adapterInfo("Execute at start set to (dictionary input is ignored): " + this->executeAtStart())); + adapter_.configure(); #ifdef ADAPTER_ENABLE_TIMINGS @@ -139,21 +144,4 @@ bool Foam::functionObjects::preciceAdapterFunctionObject::write() return true; } -bool Foam::functionObjects::preciceAdapterFunctionObject::adjustTimeStep() -{ -#ifdef ADAPTER_ENABLE_TIMINGS - clockValue clock; - clock.update(); -#endif - - adapter_.adjustTimeStep(); - -#ifdef ADAPTER_ENABLE_TIMINGS - timeInAll_ += clock.elapsed(); - timeInExecute_ += clock.elapsed(); -#endif - - return true; -} - // ************************************************************************* // diff --git a/preciceAdapterFunctionObject.H b/preciceAdapterFunctionObject.H index 1cb8792f..d3eda1e7 100644 --- a/preciceAdapterFunctionObject.H +++ b/preciceAdapterFunctionObject.H @@ -59,7 +59,9 @@ SourceFiles // OpenFOAM header files #include "fvMeshFunctionObject.H" -#include "clockValue.H" +#ifdef ADAPTER_ENABLE_TIMINGS +#include "clockValue.H" // Not available in OpenFOAM.org, do not enable +#endif // Main adapter header file #include "Adapter.H" @@ -131,8 +133,12 @@ public: //- Write the preciceAdapterFunctionObject bool write() final; - //- Called at the end of Time::adjustDeltaT() if adjustTime is true - bool adjustTimeStep() final; + //- Return the list of fields required + // (pure virtual since OpenFOAM 10) + virtual wordList fields() const + { + return wordList::null(); + } /* // NOTE: If you add a new module that needs to execute methods diff --git a/primitivePatchInterpolation.H b/primitivePatchInterpolation.H new file mode 100644 index 00000000..9668b0c9 --- /dev/null +++ b/primitivePatchInterpolation.H @@ -0,0 +1,84 @@ +/*---------------------------------------------------------------------------*\ + Copyright (C) 2017 Gerasimos Chourdakis +------------------------------------------------------------------------------- +------------------------------------------------------------------------------- +* Copyright (C) 2025 Gesellschaft fuer Anlagen- und Reaktorsicherheit * +* (GRS) gGmbH * +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM-preCICE adapter. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version with terms added by GRS. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License with terms by GRS for more details. + + You should have received a copy of the GNU General Public License + with terms by GRS along with this program. If not, please + contact your conveyor or GRS gGmbH. + For a copy of the unmodified GNU General Public License, see + . + +\*---------------------------------------------------------------------------*/ + +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Typedef + Foam::primitivePatchInterpolation + +Description + Foam::primitivePatchInterpolation + +\*---------------------------------------------------------------------------*/ + +#ifndef primitivePatchInterpolation_H +#define primitivePatchInterpolation_H + +#include "PrimitivePatchInterpolation.H" +#include "PrimitivePatch.H" +#include "face.H" +#include "SubList.H" +#include "pointField.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + typedef PrimitivePatchInterpolation + < + PrimitivePatch, const pointField&> + > + primitivePatchInterpolation; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* //