ENH: make expressions::FieldAssociation a common enum

- use FACE_DATA (was SURFACE_DATA) for similarity with polySurface

ENH: add expression value enumerations and traits

- simple enumeration of standard types (bool, label, scalar, vector)
  that can be used as a value type-code for internal bookkeeping.

GIT: relocate pTraits into general traits/ directory
This commit is contained in:
Mark Olesen
2021-11-23 11:13:42 +01:00
parent 141403ed98
commit fbd7b78999
19 changed files with 442 additions and 55 deletions

View File

@ -53,15 +53,15 @@ Note
using namespace Foam;
using FieldAssociation = expressions::volumeExpr::FieldAssociation;
using FieldAssociation = expressions::FieldAssociation;
word fieldGeoType(const FieldAssociation geoType)
{
switch (geoType)
{
case FieldAssociation::VOLUME_DATA : return "cells"; break;
case FieldAssociation::SURFACE_DATA : return "faces"; break;
case FieldAssociation::POINT_DATA : return "points"; break;
case FieldAssociation::FACE_DATA : return "faces"; break;
case FieldAssociation::VOLUME_DATA : return "cells"; break;
default: break;
}
@ -356,6 +356,7 @@ void evaluate
if (ptr)
{
conditionField = ptr->internalField();
// VOLUME_DATA
break;
}
}
@ -366,7 +367,7 @@ void evaluate
if (ptr)
{
conditionField = ptr->internalField();
conditionDataType = FieldAssociation::SURFACE_DATA;
conditionDataType = FieldAssociation::FACE_DATA;
break;
}
}