-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2013 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// Author : Anthony Geay (CEA/DEN)
#include "InterpolationOptions.hxx"
+#include "InterpKernelException.hxx"
#include <sstream>
const char INTERP_KERNEL::InterpolationOptions::POINTLOCATOR_INTERSECT_STR[]="PointLocator";
+const char INTERP_KERNEL::InterpolationOptions::BARYCENTRIC_INTERSECT_STR[]="Barycentric";
+
+const char INTERP_KERNEL::InterpolationOptions::BARYCENTRICGEO2D_INTERSECT_STR[]="BarycentricGeo2D";
+
const char INTERP_KERNEL::InterpolationOptions::PLANAR_SPLIT_FACE_5_STR[]="PLANAR_FACE_5";
const char INTERP_KERNEL::InterpolationOptions::PLANAR_SPLIT_FACE_6_STR[]="PLANAR_FACE_6";
_orientation=0;
_measure_abs=true;
_splitting_policy=PLANAR_FACE_5;
- _P1P0_bary_method=false;
}
std::string INTERP_KERNEL::InterpolationOptions::getIntersectionTypeRepr() const
return std::string(GEOMETRIC_INTERSECT2D_STR);
else if(_intersection_type==INTERP_KERNEL::PointLocator)
return std::string(POINTLOCATOR_INTERSECT_STR);
+ else if(_intersection_type==INTERP_KERNEL::Barycentric)
+ return std::string(BARYCENTRIC_INTERSECT_STR);
+ else if(_intersection_type==INTERP_KERNEL::BarycentricGeo2D)
+ return std::string(BARYCENTRICGEO2D_INTERSECT_STR);
else
return std::string("UNKNOWN_INTERSECT_TYPE");
}
setIntersectionType(INTERP_KERNEL::PointLocator);
return true;
}
+ else if(value==BARYCENTRIC_INTERSECT_STR)
+ {
+ setIntersectionType(INTERP_KERNEL::Barycentric);
+ return true;
+ }
+ else if(value==BARYCENTRICGEO2D_INTERSECT_STR)
+ {
+ setIntersectionType(INTERP_KERNEL::BarycentricGeo2D);
+ return true;
+ }
}
else if(key==SPLITTING_POLICY_STR)
{
std::string INTERP_KERNEL::InterpolationOptions::filterInterpolationMethod(const std::string& meth) const
{
- if ( _P1P0_bary_method && meth == "P1P0" )
- return "P1P0Bary";
- return meth;
+ return std::string(meth);
}
bool INTERP_KERNEL::InterpolationOptions::setInterpolationOptions(long print_level,
double max_distance_for_3Dsurf_intersect,
long orientation,
bool measure_abs,
- std::string splitting_policy,
- bool P1P0_bary_method )
+ std::string splitting_policy)
{
_print_level=print_level;
_precision=precision;
_max_distance_for_3Dsurf_intersect=max_distance_for_3Dsurf_intersect;
_orientation=orientation;
_measure_abs=measure_abs;
- _P1P0_bary_method=P1P0_bary_method;
return(setOptionString(INTERSEC_TYPE_STR,intersection_type) && setOptionString(SPLITTING_POLICY_STR,splitting_policy));
}
oss << "Orientation : " << _orientation << std::endl;
oss << "Measure abs : " << _measure_abs << std::endl;
oss << "Splitting policy : " << getSplittingPolicyRepr() << std::endl;
- oss << "P1P0 Barycentric method : " << _P1P0_bary_method << std::endl;
oss << "****************************" << std::endl;
return oss.str();
}
+
+void INTERP_KERNEL::InterpolationOptions::CheckAndSplitInterpolationMethod(const std::string& method, std::string& srcMeth, std::string& trgMeth)
+{
+ const int NB_OF_METH_MANAGED=4;
+ const char *METH_MANAGED[NB_OF_METH_MANAGED]={"P0P0","P0P1","P1P0","P1P1"};
+ bool found=false;
+ for(int i=0;i<NB_OF_METH_MANAGED && !found;i++)
+ found=(method==METH_MANAGED[i]);
+ if(!found)
+ {
+ std::string msg("The interpolation method : \'"); msg+=method; msg+="\' not managed by INTERP_KERNEL interpolators ! Supported are \"P0P0\", \"P0P1\", \"P1P0\" and \"P1P1\".";
+ throw INTERP_KERNEL::Exception(msg.c_str());
+ }
+ srcMeth=method.substr(0,2);
+ trgMeth=method.substr(2);
+}