Don't refer to classes in the ASM/LR sub-folder unless HAS_LRSPLINE is defined
git-svn-id: http://svn.sintef.no/trondheim/IFEM/trunk@1201 e10b68d5-8a6e-419e-a041-bce267b0401d
This commit is contained in:
parent
de6cd8d40e
commit
56e2e2642f
@ -12,7 +12,9 @@
|
||||
//==============================================================================
|
||||
|
||||
#include "AdaptiveSIM.h"
|
||||
#ifdef HAS_LRSPLINE
|
||||
#include "ASMunstruct.h"
|
||||
#endif
|
||||
#include "SIMbase.h"
|
||||
#include "SIMenums.h"
|
||||
#include "Utilities.h"
|
||||
@ -79,7 +81,9 @@ bool AdaptiveSIM::solveStep (const char* inputfile, SystemMatrix::Type solver,
|
||||
{
|
||||
// Re-generate the FE model after the refinement
|
||||
model->clearProperties();
|
||||
#ifdef HAS_LRSPLINE
|
||||
ASMunstruct::resetNumbering();
|
||||
#endif
|
||||
if (!model->read(inputfile) || !model->preprocess())
|
||||
return false;
|
||||
}
|
||||
|
@ -550,7 +550,9 @@ bool SIM2D::refine (const std::vector<int>& elements,
|
||||
{
|
||||
for (size_t i = 0; i < myModel.size(); i++)
|
||||
if (!myModel.empty())
|
||||
#ifdef HAS_LRSPLINE
|
||||
if (!static_cast<ASMu2D*>(myModel[i])->refine(elements,options,fName))
|
||||
#endif
|
||||
return false;
|
||||
|
||||
isRefined = true;
|
||||
|
Loading…
Reference in New Issue
Block a user