zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: Multiple changes - first clean build after latest merge - UNTESTED

Browse Source
This commit is contained in:
Andrew Heather
2016-09-23 15:36:53 +01:00
parent 9fbd612672
commit b9940cbbb1
311 changed files with 4119 additions and 6540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
View File

@ -70,12 +70,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh>>
volField
(
const fvMeshSubset& meshSubsetter,
const typename GeometricField
<
Type,
fvPatchField,
volMesh
>::DimensionedInternalField& df
const typename GeometricField<Type, fvPatchField, volMesh>::Internal& df
)
{
// Construct volField (with zeroGradient) from dimensioned field
@ -93,7 +88,7 @@ volField
zeroGradientFvPatchField<scalar>::typeName
)
);
tvf.ref().internalField() = df;
tvf.ref().primitiveFieldRef() = df;
tvf.ref().correctBoundaryConditions();
const GeometricField<Type, fvPatchField, volMesh>& vf = tvf();

4
applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -60,7 +60,7 @@ volField
Type,
Foam::fvPatchField,
Foam::volMesh
>::DimensionedInternalField& df
>::Internal& df
);

54
applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
View File

@ -186,11 +186,11 @@ int main(int argc, char *argv[])
volSymmTensorField::typeName,
volTensorField::typeName,
volScalarField::DimensionedInternalField::typeName,
volVectorField::DimensionedInternalField::typeName,
volSphericalTensorField::DimensionedInternalField::typeName,
volSymmTensorField::DimensionedInternalField::typeName,
volTensorField::DimensionedInternalField::typeName
volScalarField::Internal::typeName,
volVectorField::Internal::typeName,
volSphericalTensorField::Internal::typeName,
volSymmTensorField::Internal::typeName,
volTensorField::Internal::typeName
};
// Path to EnSight directory at case level only
@ -562,15 +562,10 @@ int main(int argc, char *argv[])
// DimensionedFields
else if
(
volFieldTypes[i]
== volScalarField::DimensionedInternalField::typeName
volFieldTypes[i] == volScalarField::Internal::typeName
)
{
volScalarField::DimensionedInternalField df
(
fieldObject,
mesh
);
volScalarField::Internal df(fieldObject, mesh);
ensightField<scalar>
(
volField<scalar>(meshSubsetter, df),
@ -585,15 +580,10 @@ int main(int argc, char *argv[])
}
else if
(
volFieldTypes[i]
== volVectorField::DimensionedInternalField::typeName
volFieldTypes[i] == volVectorField::Internal::typeName
)
{
volVectorField::DimensionedInternalField df
(
fieldObject,
mesh
);
volVectorField::Internal df(fieldObject, mesh);
ensightField<vector>
(
volField<vector>(meshSubsetter, df),
@ -609,14 +599,10 @@ int main(int argc, char *argv[])
else if
(
volFieldTypes[i]
== volSphericalTensorField::DimensionedInternalField::typeName
== volSphericalTensorField::Internal::typeName
)
{
volSphericalTensorField::DimensionedInternalField df
(
fieldObject,
mesh
);
volSphericalTensorField::Internal df(fieldObject, mesh);
ensightField<sphericalTensor>
(
volField<sphericalTensor>(meshSubsetter, df),
@ -631,15 +617,10 @@ int main(int argc, char *argv[])
}
else if
(
volFieldTypes[i]
== volSymmTensorField::DimensionedInternalField::typeName
volFieldTypes[i] == volSymmTensorField::Internal::typeName
)
{
volSymmTensorField::DimensionedInternalField df
(
fieldObject,
mesh
);
volSymmTensorField::Internal df(fieldObject, mesh);
ensightField<symmTensor>
(
volField<symmTensor>(meshSubsetter, df),
@ -654,15 +635,10 @@ int main(int argc, char *argv[])
}
else if
(
volFieldTypes[i]
== volTensorField::DimensionedInternalField::typeName
volFieldTypes[i] == volTensorField::Internal::typeName
)
{
volTensorField::DimensionedInternalField df
(
fieldObject,
mesh
);
volTensorField::Internal df(fieldObject, mesh);
ensightField<tensor>
(
volField<tensor>(meshSubsetter, df),

12
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -618,11 +618,11 @@ int main(int argc, char *argv[])
// Construct dimensioned fields
PtrList<volScalarField::DimensionedInternalField> dsf;
PtrList<volVectorField::DimensionedInternalField> dvf;
PtrList<volSphericalTensorField::DimensionedInternalField> dSpheretf;
PtrList<volSymmTensorField::DimensionedInternalField> dSymmtf;
PtrList<volTensorField::DimensionedInternalField> dtf;
PtrList<const volScalarField::Internal> dsf;
PtrList<const volVectorField::Internal> dvf;
PtrList<const volSphericalTensorField::Internal> dSpheretf;
PtrList<const volSymmTensorField::Internal> dSymmtf;
PtrList<const volTensorField::Internal> dtf;
if (!specifiedFields || selectedFields.size())
{

4
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriter.H
View File

@ -98,7 +98,7 @@ public:
template<class Type, class GeoMesh>
void write
(
const PtrList<DimensionedField<Type, volMesh>>& flds
const PtrList<const DimensionedField<Type, volMesh>>& flds
);
//- Interpolate and write volFields
@ -114,7 +114,7 @@ public:
void write
(
const volPointInterpolation&,
const PtrList<DimensionedField<Type, volMesh>>&
const PtrList<const DimensionedField<Type, volMesh>>&
);
};

4
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/internalWriterTemplates.C
View File

@ -44,7 +44,7 @@ void Foam::internalWriter::write
template<class Type, class GeoMesh>
void Foam::internalWriter::write
(
const PtrList<DimensionedField<Type, volMesh>>& flds
const PtrList<const DimensionedField<Type, volMesh>>& flds
)
{
forAll(flds, i)
@ -79,7 +79,7 @@ template<class Type, class GeoMesh>
void Foam::internalWriter::write
(
const volPointInterpolation& pInterp,
const PtrList<DimensionedField<Type, volMesh>>& flds
const PtrList<const DimensionedField<Type, volMesh>>& flds
)
{
forAll(flds, i)

8
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeFunsTemplates.C
View File

@ -64,7 +64,7 @@ void Foam::writeFuns::write
(
std::ostream& os,
const bool binary,
const DimensionedField<Type, volMesh>& vvf,
const DimensionedField<Type, volMesh>& df,
const vtkMesh& vMesh
)
{
@ -74,19 +74,19 @@ void Foam::writeFuns::write
label nValues = mesh.nCells() + superCells.size();
os << vvf.name() << ' '
os << df.name() << ' '
<< int(pTraits<Type>::nComponents) << ' '
<< nValues << " float" << std::endl;
DynamicList<floatScalar> fField(pTraits<Type>::nComponents*nValues);
insert(vvf.primitiveField(), fField);
insert(df.field(), fField);
forAll(superCells, superCelli)
{
label origCelli = superCells[superCelli];
insert(vvf[origCelli], fField);
insert(df[origCelli], fField);
}
write(os, binary, fField);
}

6
applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracksTemplates.C
View File

@ -116,11 +116,11 @@ void Foam::writeVTKFields
Info<< " writing field " << fieldNames[fieldi] << endl;
os << nl << fieldNames[fieldi] << ' '
<< int(pTraits<Type>::nComponents) << ' '
<< values[fieldI].size() << " float" << nl;
<< values[fieldi].size() << " float" << nl;
label offset = 0;
forAll(addr, trackI)
forAll(addr, tracki)
{
const List<label> ids(addr[trackI]);
const List<label> ids(addr[tracki]);
List<Type> data(UIndirectList<Type>(values[fieldi], ids));
label nData = data.size() - 1;