From 81714806c263344a6a4efe8e1c58866a91db42af Mon Sep 17 00:00:00 2001 From: hnil Date: Tue, 26 May 2020 16:16:42 +0200 Subject: [PATCH 1/3] hide all vtk related if not vtk enabled --- opm/simulators/flow/FlowMainEbos.hpp | 39 +++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/opm/simulators/flow/FlowMainEbos.hpp b/opm/simulators/flow/FlowMainEbos.hpp index 2fca6660d..310d6fcf3 100644 --- a/opm/simulators/flow/FlowMainEbos.hpp +++ b/opm/simulators/flow/FlowMainEbos.hpp @@ -150,7 +150,44 @@ namespace Opm // the default eWoms checkpoint/restart mechanism does not work with flow EWOMS_HIDE_PARAM(TypeTag, RestartTime); EWOMS_HIDE_PARAM(TypeTag, RestartWritingInterval); - + // hide all vtk related + if(not(EWOMS_GET_PARAM(TypeTag,bool,EnableAsyncVtkOutput))){ + EWOMS_HIDE_PARAM(TypeTag, VtkWriteAverageMolarMasses); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteDensities); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteDofIndex); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteEclTracerConcentration); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteExtrusionFactor); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteFilterVelocities); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteFugacities); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteFugacityCoeffs); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteGasDissolutionFactor); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteGasFormationVolumeFactor); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteGasSaturationPressure); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteIntrinsicPermeabilities); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteMassFractions); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteMobilities); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteMolarities); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteMoleFractions); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteOilFormationVolumeFactor); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteOilSaturationPressure); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteOilVaporizationFactor); + EWOMS_HIDE_PARAM(TypeTag, VtkWritePorosity); + EWOMS_HIDE_PARAM(TypeTag, VtkWritePotentialGradients); + EWOMS_HIDE_PARAM(TypeTag, VtkWritePressures); + EWOMS_HIDE_PARAM(TypeTag, VtkWritePrimaryVars); + EWOMS_HIDE_PARAM(TypeTag, VtkWritePrimaryVarsMeaning); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteProcessRank); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteRelativePermeabilities); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteSaturatedGasOilVaporizationFactor); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteSaturatedOilGasDissolutionFactor); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteSaturationRatios); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteSaturations); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteTemperature); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteTotalMassFractions); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteTotalMoleFractions); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteViscosities); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteWaterFormationVolumeFactor); + } EWOMS_END_PARAM_REGISTRATION(TypeTag); int mpiRank = 0; From 95ead78a0dd27824c43bbd52d51c5c4bb354e0e7 Mon Sep 17 00:00:00 2001 From: hnil Date: Tue, 26 May 2020 21:56:51 +0200 Subject: [PATCH 2/3] made all vtk paramters allways be hidden --- opm/simulators/flow/FlowMainEbos.hpp | 45 ++++++++++++++-------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/opm/simulators/flow/FlowMainEbos.hpp b/opm/simulators/flow/FlowMainEbos.hpp index 310d6fcf3..ab9d0900e 100644 --- a/opm/simulators/flow/FlowMainEbos.hpp +++ b/opm/simulators/flow/FlowMainEbos.hpp @@ -150,24 +150,8 @@ namespace Opm // the default eWoms checkpoint/restart mechanism does not work with flow EWOMS_HIDE_PARAM(TypeTag, RestartTime); EWOMS_HIDE_PARAM(TypeTag, RestartWritingInterval); - // hide all vtk related - if(not(EWOMS_GET_PARAM(TypeTag,bool,EnableAsyncVtkOutput))){ - EWOMS_HIDE_PARAM(TypeTag, VtkWriteAverageMolarMasses); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteDensities); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteDofIndex); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteEclTracerConcentration); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteExtrusionFactor); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteFilterVelocities); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteFugacities); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteFugacityCoeffs); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteGasDissolutionFactor); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteGasFormationVolumeFactor); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteGasSaturationPressure); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteIntrinsicPermeabilities); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteMassFractions); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteMobilities); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteMolarities); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteMoleFractions); + // hide all vtk related it is not currently possible to do this dependet on if the vtk writing is used + //if(not(EWOMS_GET_PARAM(TypeTag,bool,EnableAsyncVtkOutput))){ EWOMS_HIDE_PARAM(TypeTag, VtkWriteOilFormationVolumeFactor); EWOMS_HIDE_PARAM(TypeTag, VtkWriteOilSaturationPressure); EWOMS_HIDE_PARAM(TypeTag, VtkWriteOilVaporizationFactor); @@ -183,11 +167,28 @@ namespace Opm EWOMS_HIDE_PARAM(TypeTag, VtkWriteSaturationRatios); EWOMS_HIDE_PARAM(TypeTag, VtkWriteSaturations); EWOMS_HIDE_PARAM(TypeTag, VtkWriteTemperature); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteTotalMassFractions); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteTotalMoleFractions); EWOMS_HIDE_PARAM(TypeTag, VtkWriteViscosities); - EWOMS_HIDE_PARAM(TypeTag, VtkWriteWaterFormationVolumeFactor); - } + EWOMS_HIDE_PARAM(TypeTag, VtkWriteWaterFormationVolumeFactor); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteGasDissolutionFactor); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteGasFormationVolumeFactor); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteGasSaturationPressure); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteIntrinsicPermeabilities); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteEclTracerConcentration); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteExtrusionFactor); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteFilterVelocities); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteDensities); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteDofIndex); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteMobilities); + //} + EWOMS_HIDE_PARAM(TypeTag, VtkWriteAverageMolarMasses); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteFugacities); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteFugacityCoeffs); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteMassFractions); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteMolarities); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteMoleFractions); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteTotalMassFractions); + EWOMS_HIDE_PARAM(TypeTag, VtkWriteTotalMoleFractions); + EWOMS_END_PARAM_REGISTRATION(TypeTag); int mpiRank = 0; From 16edd5ecc502c83c034e80037ff0252b020b29e6 Mon Sep 17 00:00:00 2001 From: hnil Date: Tue, 26 May 2020 22:04:42 +0200 Subject: [PATCH 3/3] fixed commented code --- opm/simulators/flow/FlowMainEbos.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opm/simulators/flow/FlowMainEbos.hpp b/opm/simulators/flow/FlowMainEbos.hpp index ab9d0900e..158912fa0 100644 --- a/opm/simulators/flow/FlowMainEbos.hpp +++ b/opm/simulators/flow/FlowMainEbos.hpp @@ -151,7 +151,7 @@ namespace Opm EWOMS_HIDE_PARAM(TypeTag, RestartTime); EWOMS_HIDE_PARAM(TypeTag, RestartWritingInterval); // hide all vtk related it is not currently possible to do this dependet on if the vtk writing is used - //if(not(EWOMS_GET_PARAM(TypeTag,bool,EnableAsyncVtkOutput))){ + //if(not(EWOMS_GET_PARAM(TypeTag,bool,EnableVtkOutput))){ EWOMS_HIDE_PARAM(TypeTag, VtkWriteOilFormationVolumeFactor); EWOMS_HIDE_PARAM(TypeTag, VtkWriteOilSaturationPressure); EWOMS_HIDE_PARAM(TypeTag, VtkWriteOilVaporizationFactor);