Commit c24d19fd authored by cyrush's avatar cyrush

merge 2.12rc to trunk

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@29670 18c085ea-50e0-402c-830e-de6fd14e8384
parent 9e2a9ecd
Function: ProcessOldVersions
Declaration: virtual void ProcessOldVersions(DataNode *node, const char *configVersion);
Definition:
// ****************************************************************************
// Method: IntegralCurveAttributes::ProcessOldVersions
//
// Purpose:
// Updates the config settings in the data node to the current IndexSelect
// opertor version.
//
// Arguments:
// parentNode : The data node that stores the IndexSelect attributes.
// configVersion : The version of the config file from which the node
// was read.
//
// Programmer: Allen Sanderson
// Creation: 8 March 2016
//
// Modifications:
//
// ****************************************************************************
void
IntegralCurveAttributes::ProcessOldVersions(DataNode *parentNode,
const char *configVersion)
{
if(parentNode == 0)
return;
if (VersionLessThan(configVersion, "2.11.0"))
{
DataNode *searchNode = parentNode->GetNode("IntegralCurveAttributes");
if(searchNode == 0)
return;
DataNode *sourceNode = searchNode->GetNode("sourceType");
if(sourceNode == 0)
return;
std::string mode = sourceNode->AsString();
if (mode == "Point")
{
searchNode->RemoveNode(sourceNode, true);
searchNode->AddNode(new DataNode("sourceType", SourceType_ToString(IntegralCurveAttributes::SpecifiedPoint)));
}
else if (mode == "Line_")
{
searchNode->RemoveNode(sourceNode, true);
searchNode->AddNode(new DataNode("sourceType", SourceType_ToString(IntegralCurveAttributes::SpecifiedLine)));
}
else if (mode == "Plane")
{
searchNode->RemoveNode(sourceNode, true);
searchNode->AddNode(new DataNode("sourceType", SourceType_ToString(IntegralCurveAttributes::SpecifiedPlane)));
}
else if (mode == "Box")
{
searchNode->RemoveNode(sourceNode, true);
searchNode->AddNode(new DataNode("sourceType", SourceType_ToString(IntegralCurveAttributes::SpecifiedBox)));
}
else if (mode == "Sphere")
{
searchNode->RemoveNode(sourceNode, true);
searchNode->AddNode(new DataNode("sourceType", SourceType_ToString(IntegralCurveAttributes::SpecifiedSphere)));
}
}
}
Target: xml2atts
Function: CopyAttributes
Declaration: bool CopyAttributes(const AttributeGroup *atts);
Definition:
......@@ -160,7 +90,6 @@ IntegralCurveAttributes::CopyAttributes(const AttributeGroup *atts)
return retval;
}
Target: xml2atts
Function: CreateCompatible
Declaration: AttributeSubject *CreateCompatible(const std::string &tname) const
Definition:
......@@ -242,7 +171,6 @@ IntegralCurveAttributes::CreateCompatible(const std::string &tname) const
return retval;
}
Target: xml2atts
Function: ChangesRequireRecalculation
Declaration: bool ChangesRequireRecalculation(const IntegralCurveAttributes &) const;
Definition:
......@@ -460,6 +388,75 @@ IntegralCurveAttributes::ChangesRequireRecalculation(const IntegralCurveAttribut
return false;
}
Function: ProcessOldVersions
Declaration: virtual void ProcessOldVersions(DataNode *node, const char *configVersion);
Definition:
// ****************************************************************************
// Method: IntegralCurveAttributes::ProcessOldVersions
//
// Purpose:
// Updates the config settings in the data node to the current IndexSelect
// opertor version.
//
// Arguments:
// parentNode : The data node that stores the IndexSelect attributes.
// configVersion : The version of the config file from which the node
// was read.
//
// Programmer: Allen Sanderson
// Creation: 8 March 2016
//
// Modifications:
//
// ****************************************************************************
void
IntegralCurveAttributes::ProcessOldVersions(DataNode *parentNode,
const char *configVersion)
{
if(parentNode == 0)
return;
if (VersionLessThan(configVersion, "2.11.0"))
{
DataNode *searchNode = parentNode->GetNode("IntegralCurveAttributes");
if(searchNode == 0)
return;
DataNode *sourceNode = searchNode->GetNode("sourceType");
if(sourceNode == 0)
return;
std::string mode = sourceNode->AsString();
if (mode == "Point")
{
searchNode->RemoveNode(sourceNode, true);
searchNode->AddNode(new DataNode("sourceType", SourceType_ToString(IntegralCurveAttributes::SpecifiedPoint)));
}
else if (mode == "Line_")
{
searchNode->RemoveNode(sourceNode, true);
searchNode->AddNode(new DataNode("sourceType", SourceType_ToString(IntegralCurveAttributes::SpecifiedLine)));
}
else if (mode == "Plane")
{
searchNode->RemoveNode(sourceNode, true);
searchNode->AddNode(new DataNode("sourceType", SourceType_ToString(IntegralCurveAttributes::SpecifiedPlane)));
}
else if (mode == "Box")
{
searchNode->RemoveNode(sourceNode, true);
searchNode->AddNode(new DataNode("sourceType", SourceType_ToString(IntegralCurveAttributes::SpecifiedBox)));
}
else if (mode == "Sphere")
{
searchNode->RemoveNode(sourceNode, true);
searchNode->AddNode(new DataNode("sourceType", SourceType_ToString(IntegralCurveAttributes::SpecifiedSphere)));
}
}
}
Target: xml2info
Function: IntegralCurveViewerEnginePluginInfo::GetOperatorVarDescription
Declaration: virtual std::string GetOperatorVarDescription(AttributeSubject *atts, const avtPlotMetaData &plot);
......@@ -521,3 +518,4 @@ IntegralCurveViewerEnginePluginInfo::GetOperatorVarDescription(AttributeSubject
return var;
}
<?xml version="1.0"?>
<Plugin name="IntegralCurve" type="operator" label="IntegralCurve" version="1.0" enabled="true" mdspecificcode="false" engspecificcode="false" onlyengine="false" noengine="false" category="Integral Curves" createExpression="true" exprInType="vector" exprOutType="scalar" iconFile="IntegralCurve.xpm">
<Plugin name="IntegralCurve" type="operator" label="IntegralCurve" version="1.0" enabled="true" mdspecificcode="false" engspecificcode="false" onlyengine="false" noengine="false" iconFile="IntegralCurve.xpm" category="Integral Curves" createExpression="true" exprInType="vector" exprOutType="scalar">
<LDFLAGS>
${NEKTAR++_LIBRARY_DIR}
${NEKTAR++_LIBRARY_DIRS}
${NEKTAR++_TP_LIBRARY_DIRS}
${ACCELERATE_FRAMEWORK_LINK_FLAGS}
</LDFLAGS>
<Files components="V">
</Files>
<Files components="E">
avtIntegralCurveFilter.C
</Files>
<LDFLAGS>
${NEKTAR++_LIBRARY_DIR} ${NEKTAR++_LIBRARY_DIRS} ${NEKTAR++_TP_LIBRARY_DIRS} ${ACCELERATE_FRAMEWORK_LINK_FLAGS}
</LDFLAGS>
<LIBS components="ESer">
avtivp_ser
</LIBS>
......@@ -224,7 +227,7 @@
0.000000
</Field>
<Field name="integrationType" label="Integrator" type="enum" subtype="IntegrationType">
AdamsBashforth
DormandPrince
</Field>
<Field name="parallelizationAlgorithmType" label="Parallelization algorithm type" type="enum" subtype="ParallelizationAlgorithmType">
VisItSelects
......@@ -248,7 +251,7 @@
0.000000
</Field>
<Field name="pathlinesPeriod" label="Pathlines Period" type="double">
0.0
0.000000
</Field>
<Field name="pathlinesCMFE" label="CMFE" type="enum" subtype="PathlinesCMFE">
POS_CMFE
......@@ -260,19 +263,19 @@
NoCleanup
</Field>
<Field name="cleanupThreshold" label="Cleanup Threshold" type="double">
1.0e-8
1e-08
</Field>
<Field name="cropBeginFlag" label="Crop from" type="bool">
false
</Field>
<Field name="cropBegin" label="cropBegin" type="double">
0
0.000000
</Field>
<Field name="cropEndFlag" label="Crop to" type="bool">
false
</Field>
<Field name="cropEnd" label="cropEnd" type="double">
0
0.000000
</Field>
<Field name="cropValue" label="Crop value" type="enum" subtype="CropValue">
Time
......
......@@ -547,7 +547,7 @@ void IntegralCurveAttributes::Init()
velocitySource[0] = 0;
velocitySource[1] = 0;
velocitySource[2] = 0;
integrationType = AdamsBashforth;
integrationType = DormandPrince;
parallelizationAlgorithmType = VisItSelects;
maxProcessCount = 10;
maxDomainCacheSize = 3;
......
......@@ -210,7 +210,7 @@ public class IntegralCurveAttributes extends AttributeSubject implements Plugin
velocitySource[0] = 0;
velocitySource[1] = 0;
velocitySource[2] = 0;
integrationType = INTEGRATIONTYPE_ADAMSBASHFORTH;
integrationType = INTEGRATIONTYPE_DORMANDPRINCE;
parallelizationAlgorithmType = PARALLELIZATIONALGORITHMTYPE_VISITSELECTS;
maxProcessCount = 10;
maxDomainCacheSize = 3;
......@@ -326,7 +326,7 @@ public class IntegralCurveAttributes extends AttributeSubject implements Plugin
velocitySource[0] = 0;
velocitySource[1] = 0;
velocitySource[2] = 0;
integrationType = INTEGRATIONTYPE_ADAMSBASHFORTH;
integrationType = INTEGRATIONTYPE_DORMANDPRINCE;
parallelizationAlgorithmType = PARALLELIZATIONALGORITHMTYPE_VISITSELECTS;
maxProcessCount = 10;
maxDomainCacheSize = 3;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment