Changed variable name and set the number of integration points for FL…

…UID_MOMENTUM
ufz · Jun 24, 2016 · 7f61caa · 7f61caa
1 parent b112b5c
commit 7f61caa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/FEM/rf_fluid_momentum.cpp b/FEM/rf_fluid_momentum.cpp
@@ -167,6 +167,7 @@ double CFluidMomentum::Execute(int loop_process_number)
 
 				fem->setShapeFunctionPool(pcs_fem->getShapeFunctionPool(0),
 										  pcs_fem->getShapeFunctionPool(1));
+				fem->SetGaussPointNumber(pcs_fem->GetNumGaussSamples());
 
 				SolveDarcyVelocityOnNode();
 				delete fem;

diff --git a/FEM/rf_st_new.cpp b/FEM/rf_st_new.cpp
@@ -1836,7 +1836,7 @@ void CSourceTerm::FaceIntegration(CRFProcess* pcs, std::vector<long> const& node
 	}
 
 	CElement* fem_assembler_quad = NULL;
-	CElement* fem_assembler_line = dynamic_cast<CElement*>(pcs->getLinearFEMAssembler());
+	CElement* fem_assembler_linear = dynamic_cast<CElement*>(pcs->getLinearFEMAssembler());
 	if (pcs->getProcessType() == FiniteElement::DEFORMATION
 	    || pcs->getProcessType() == FiniteElement::DEFORMATION_DYNAMIC
 	    || pcs->getProcessType() == FiniteElement::DEFORMATION_FLOW
@@ -1846,7 +1846,7 @@ void CSourceTerm::FaceIntegration(CRFProcess* pcs, std::vector<long> const& node
 		fem_assembler_quad = dynamic_cast<CElement*>(dm_pcs->GetFEMAssembler());
 	}
 
-	CElement* fem_assembler = (msh->getOrder() == 1) ? fem_assembler_quad : fem_assembler_line;
+	CElement* fem_assembler = (msh->getOrder() == 1) ? fem_assembler_quad : fem_assembler_linear;
 	assert(fem_assembler);
 
 	fem_assembler->setOrder(msh->getOrder() + 1);