From aafbca93b2fb0a23ef0a67c29ae555db5bc1f784 Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 6 Mar 2019 11:35:16 +0000 Subject: [PATCH] ENH: old-time field: avoid reading in postprocessing mode. Fixes #1228. --- .../preProcessing/mapFields/MapConsistentVolFields.H | 6 +++--- .../utilities/preProcessing/mapFields/MapVolFields.H | 9 +++++---- .../utilities/preProcessing/mapFieldsPar/MapVolFields.H | 4 ++-- .../utilities/preProcessing/setFields/setFields.C | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H b/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H index 4728139666..ae2b19b97c 100644 --- a/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H +++ b/applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H @@ -58,8 +58,8 @@ void MapConsistentVolFields Info<< " interpolating " << fieldIter()->name() << endl; - // Read field - fieldType fieldSource(*fieldIter(), meshSource); + // Read field. Do not auto-load old-time field + fieldType fieldSource(*fieldIter(), meshSource, false); IOobject fieldTargetIOobject ( @@ -73,7 +73,7 @@ void MapConsistentVolFields if (fieldTargetIOobject.typeHeaderOk(true)) { // Read fieldTarget - fieldType fieldTarget(fieldTargetIOobject, meshTarget); + fieldType fieldTarget(fieldTargetIOobject, meshTarget, false); // Interpolate field meshToMesh0Interp.interpolate diff --git a/applications/utilities/preProcessing/mapFields/MapVolFields.H b/applications/utilities/preProcessing/mapFields/MapVolFields.H index 18b5e84b7b..921a6389a4 100644 --- a/applications/utilities/preProcessing/mapFields/MapVolFields.H +++ b/applications/utilities/preProcessing/mapFields/MapVolFields.H @@ -68,14 +68,15 @@ void MapVolFields { Info<< " interpolating " << fieldIter()->name() << endl; - // Read field fieldSource - fieldType fieldSource(*fieldIter(), meshSource); + // Read field fieldSource. Do not auto-load old-time fields + fieldType fieldSource(*fieldIter(), meshSource, false); - // Read fieldTarget + // Read fieldTarget. Do not auto-load old-time fields fieldType fieldTarget ( fieldTargetIOobject, - meshTarget + meshTarget, + false ); // Interpolate field diff --git a/applications/utilities/preProcessing/mapFieldsPar/MapVolFields.H b/applications/utilities/preProcessing/mapFieldsPar/MapVolFields.H index 8091cfc688..f1f1e83b8f 100644 --- a/applications/utilities/preProcessing/mapFieldsPar/MapVolFields.H +++ b/applications/utilities/preProcessing/mapFieldsPar/MapVolFields.H @@ -143,7 +143,7 @@ void MapVolFields for (const word& fieldName : fieldNames) { - const fieldType fieldSource(*(objects[fieldName]), meshSource); + const fieldType fieldSource(*(objects[fieldName]), meshSource, false); IOobject targetIO ( @@ -158,7 +158,7 @@ void MapVolFields Info<< " interpolating onto existing field " << fieldName << endl; - fieldType fieldTarget(targetIO, meshTarget); + fieldType fieldTarget(targetIO, meshTarget, false); interp.mapSrcToTgt(fieldSource, cop, fieldTarget); diff --git a/applications/utilities/preProcessing/setFields/setFields.C b/applications/utilities/preProcessing/setFields/setFields.C index 49ce978817..e344d2994a 100644 --- a/applications/utilities/preProcessing/setFields/setFields.C +++ b/applications/utilities/preProcessing/setFields/setFields.C @@ -90,7 +90,7 @@ bool setCellFieldType << fieldHeader.headerClassName() << " " << fieldName << endl; - fieldType field(fieldHeader, mesh); + fieldType field(fieldHeader, mesh, false); const Type& value = pTraits(fieldValueStream);