diff --git a/src/surfMesh/writers/abaqus/abaqusSurfaceWriter.C b/src/surfMesh/writers/abaqus/abaqusSurfaceWriter.C index 9d3fd373e0..f5166c6d70 100644 --- a/src/surfMesh/writers/abaqus/abaqusSurfaceWriter.C +++ b/src/surfMesh/writers/abaqus/abaqusSurfaceWriter.C @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2020 OpenCFD Ltd. + Copyright (C) 2020-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -150,7 +150,7 @@ void Foam::surfaceWriters::abaqusWriter::writeGeometry << "** Points" << nl << "**" << nl; - fileFormats::ABAQUSCore::writePoints(os, points, geometryScale_); + fileFormats::ABAQUSCore::writePoints(os, points); // Write faces, with on-the-fly decomposition (triangulation) @@ -237,7 +237,6 @@ void Foam::surfaceWriters::abaqusWriter::writeGeometry Foam::surfaceWriters::abaqusWriter::abaqusWriter() : surfaceWriter(), - geometryScale_(1), noGeometry_(false), outputLayout_(outputLayoutType::BY_FIELD) {} @@ -249,7 +248,6 @@ Foam::surfaceWriters::abaqusWriter::abaqusWriter ) : surfaceWriter(options), - geometryScale_(options.getOrDefault("scale", 1)), noGeometry_(options.getOrDefault("noGeometry", false)), outputLayout_(outputLayoutType::BY_FIELD) {} @@ -328,7 +326,8 @@ Foam::fileName Foam::surfaceWriters::abaqusWriter::write() } - const meshedSurf& surf = surface(); + // const meshedSurf& surf = surface(); + const meshedSurfRef& surf = adjustSurface(); if (Pstream::master() || !parallel_) { diff --git a/src/surfMesh/writers/abaqus/abaqusSurfaceWriter.H b/src/surfMesh/writers/abaqus/abaqusSurfaceWriter.H index 24bdf22eda..cb406661ba 100644 --- a/src/surfMesh/writers/abaqus/abaqusSurfaceWriter.H +++ b/src/surfMesh/writers/abaqus/abaqusSurfaceWriter.H @@ -31,11 +31,12 @@ Description The formatOptions for abaqus: \table - Property | Description | Required | Default - scale | output geometry scaling | no | 1 + Property | Description | Reqd | Default + scale | Output geometry scaling | no | 1 + transform | Output coordinate transform | no | fieldLevel | Subtract field level before scaling | no | empty dict fieldScale | Output field scaling | no | empty dict - noGeometry | Suppress geometry output (beta feature) | no | false + noGeometry | Suppress geometry output (beta feature) | no | false \endtable For example, @@ -112,9 +113,6 @@ class abaqusWriter { // Private Data - //- Output geometry scaling - const scalar geometryScale_; - //- BETA feature bool noGeometry_; diff --git a/src/surfMesh/writers/abaqus/abaqusSurfaceWriterImpl.C b/src/surfMesh/writers/abaqus/abaqusSurfaceWriterImpl.C index 1ca932b147..df06f13694 100644 --- a/src/surfMesh/writers/abaqus/abaqusSurfaceWriterImpl.C +++ b/src/surfMesh/writers/abaqus/abaqusSurfaceWriterImpl.C @@ -126,7 +126,8 @@ Foam::fileName Foam::surfaceWriters::abaqusWriter::writeTemplate } - const meshedSurf& surf = surface(); + // const meshedSurf& surf = surface(); + const meshedSurfRef& surf = adjustSurface(); if (Pstream::master() || !parallel_) { diff --git a/src/surfMesh/writers/boundary/boundaryDataSurfaceWriter.C b/src/surfMesh/writers/boundary/boundaryDataSurfaceWriter.C index fde30e2ebc..982d34e22b 100644 --- a/src/surfMesh/writers/boundary/boundaryDataSurfaceWriter.C +++ b/src/surfMesh/writers/boundary/boundaryDataSurfaceWriter.C @@ -169,7 +169,8 @@ Foam::fileName Foam::surfaceWriters::boundaryDataWriter::write() // Dummy Time to use as objectRegistry autoPtr