--- trunk/finley/src/Assemble_integrate.c 2007/03/26 08:29:18 1063 +++ trunk/finley/src/Assemble_integrate.c 2007/03/27 06:21:02 1064 @@ -40,30 +40,13 @@ Finley_resetError(); if (nodes==NULL || elements==NULL) return; /* set some parameter */ - - if (data_type==FINLEY_ELEMENTS) { - reducedIntegrationOrder=FALSE; - } else if (data_type==FINLEY_FACE_ELEMENTS) { - reducedIntegrationOrder=FALSE; - } else if (data_type==FINLEY_CONTACT_ELEMENTS_1) { - reducedIntegrationOrder=FALSE; - } else if (data_type==FINLEY_CONTACT_ELEMENTS_2) { - reducedIntegrationOrder=FALSE; - } else { - Finley_setError(TYPE_ERROR,"Finley_Assemble_integrate: integration of data is not possible."); - } - - /* get access to jacobean */ - jac=Finley_ElementFile_borrowJacobeans(elements,nodes,FALSE,reducedIntegrationOrder); - + jac=Finley_ElementFile_borrowJacobeans(elements,nodes,FALSE,Finley_Assemble_reducedIntegrationOrder(data)); if (Finley_noError()) { /* check the shape of the data */ if (! numSamplesEqual(data,jac->ReferenceElement->numQuadNodes,elements->numElements)) { Finley_setError(TYPE_ERROR,"Finley_Assemble_integrate: illegal number of samples of integrant kernel Data object"); } - - /* now we can start */ if (Finley_noError()) {