Merge pull request #336 from easifem-fortran/vickysharma0812

Minor fixes in Kernels

Author: vickysharma0812

src/modules/AbstractKernel/src/KernelAssembleSurfaceForce_Method.F90

@@ -112,7 +112,7 @@ SUBROUTINE KernelAssembleSurfaceForce2(rhs, dom, nbcPtrs, funcPtrs, fe,  &
   CLASS(FiniteElement_), POINTER :: spaceFE, linSpaceFE
   CLASS(NeumannBC_), POINTER :: nbc
   CLASS(UserFunction_), POINTER :: func
-  LOGICAL(LGT) :: problem, isNormal, isTangent
+  LOGICAL(LGT) :: problem, isNormal, isTangent, isSelectionByMeshID
   INTEGER(I4B) :: tmesh, nsd, id, nns, iel, tnbc, nbcNo, idof, jd,  &
     & returnType, tfunc
   INTEGER(I4B), ALLOCATABLE :: nptrs(:), meshID(:)
@@ -156,9 +156,10 @@ SUBROUTINE KernelAssembleSurfaceForce2(rhs, dom, nbcPtrs, funcPtrs, fe,  &
     problem = .NOT. ASSOCIATED(nbc)
     IF (problem) CYCLE
 
-    CALL nbc%GetParam(isSelectionByMeshID=problem,  &
+    CALL nbc%GetParam(isSelectionByMeshID=isSelectionByMeshID,  &
       & isNormal=isNormal, isTangent=isTangent)
 
+    problem = .NOT. isSelectionByMeshID
     IF (problem) THEN
       CALL e%RaiseInformation(modName//'::'//myName//' - '// &
         & '[SKIPPING] :: Currently, found isSelectionByMeshID false.')
@@ -271,7 +272,7 @@ SUBROUTINE KernelAssembleSurfaceForce3(rhs, extField, dom, nbcPtrs, fe,  &
   CLASS(ReferenceElement_), POINTER :: refelem
   CLASS(FiniteElement_), POINTER :: spaceFE, linSpaceFE
   CLASS(NeumannBC_), POINTER :: nbc
-  LOGICAL(LGT) :: problem, isNormal, isTangent
+  LOGICAL(LGT) :: problem, isNormal, isTangent, isSelectionByMeshID
   INTEGER(I4B) :: tmesh, nsd, id, nns, iel, tnbc, nbcNo, idof, jd
   INTEGER(I4B), ALLOCATABLE :: nptrs(:), meshID(:)
   REAL(DFP), ALLOCATABLE :: fevec(:, :), xij(:, :), forceVec(:, :)
@@ -304,9 +305,10 @@ SUBROUTINE KernelAssembleSurfaceForce3(rhs, extField, dom, nbcPtrs, fe,  &
     problem = .NOT. ASSOCIATED(nbc)
     IF (problem) CYCLE
 
-    CALL nbc%GetParam(isSelectionByMeshID=problem,  &
+    CALL nbc%GetParam(isSelectionByMeshID=isSelectionByMeshID,  &
       & isNormal=isNormal, isTangent=isTangent)
 
+    problem = .NOT. isSelectionByMeshID
     IF (problem) THEN
       CALL e%RaiseInformation(modName//'::'//myName//' - '// &
         & '[SKIPPING] :: Currently, found isSelectionByMeshID false.')

src/submodules/AbstractBC/src/AbstractBC_Class@GetMethods.F90

@@ -177,10 +177,10 @@
 
 MODULE PROCEDURE bc_GetQuery
 CALL obj%boundary%GetQuery(&
-& isSelectionByBox=isSelectionByBox, &
-& isSelectionByMeshID=isSelectionByMeshID, &
-& isSelectionByElemNum=isSelectionByElemNum, &
-& isSelectionByNodeNum=isSelectionByNodeNum)
+  & isSelectionByBox=isSelectionByBox, &
+  & isSelectionByMeshID=isSelectionByMeshID, &
+  & isSelectionByElemNum=isSelectionByElemNum, &
+  & isSelectionByNodeNum=isSelectionByNodeNum)
 
 IF (PRESENT(idof)) idof = obj%idof
 IF (PRESENT(isTangent)) isTangent = obj%isTangent

src/submodules/AbstractKernel/src/AbstractKernel_Class@SetMethods.F90

@@ -258,15 +258,12 @@
   & '[END] Setting Cell Finite Element.')
 #endif DEBUG_VER
 
-CALL obj%SetQuadPointsInSpace()
-CALL obj%SetLocalElemShapeDataInSpace()
-
+IF (nsd .GE. 2) THEN
 #ifdef DEBUG_VER
-CALL e%RaiseInformation(modName//'::'//myName//' - '// &
-  & '[START] Setting Facet Finite Element.')
+  CALL e%RaiseInformation(modName//'::'//myName//' - '// &
+    & '[START] Setting Facet Finite Element.')
 #endif DEBUG_VER
 
-IF (nsd .GE. 2) THEN
   elemType = obj%dom%GetElemType(dim=nsd - 1)
   order = obj%dom%GetOrder(dim=nsd - 1)
   tsize = SIZE(elemType)
@@ -312,14 +309,18 @@
 
   END DO
 
+#ifdef DEBUG_VER
+  CALL e%RaiseInformation(modName//'::'//myName//' - '// &
+    & '[END] Setting Facet Finite Element.')
+#endif DEBUG_VER
 END IF
 
+IF (nsd .GE. 3) THEN
 #ifdef DEBUG_VER
-CALL e%RaiseInformation(modName//'::'//myName//' - '// &
-  & '[END] Setting Facet Finite Element.')
+  CALL e%RaiseInformation(modName//'::'//myName//' - '// &
+    & '[START] Setting edge Finite Element.')
 #endif DEBUG_VER
 
-IF (nsd .GE. 3) THEN
   elemType = obj%dom%GetElemType(dim=nsd - 2)
   order = obj%dom%GetOrder(dim=nsd - 2)
   tsize = SIZE(elemType)
@@ -363,9 +364,18 @@
       & lambda=obj%lambdaForSpace)
   END DO
 
+#ifdef DEBUG_VER
+  CALL e%RaiseInformation(modName//'::'//myName//' - '// &
+    & '[END] Setting edge Finite Element.')
+#endif DEBUG_VER
 END IF
 
 IF (obj%nnt .GT. 1_I4B) THEN
+#ifdef DEBUG_VER
+  CALL e%RaiseInformation(modName//'::'//myName//' - '// &
+    & '[START] Setting time Finite Element.')
+#endif DEBUG_VER
+
   CALL obj%timeFE%InitiateLagrangeFE( &
     & nsd=nsd,  &
     & elemType=Line2,  &
@@ -392,8 +402,16 @@
 
   CALL obj%SetQuadPointsInTime()
   CALL obj%SetLocalElemShapeDataInTime()
+
+#ifdef DEBUG_VER
+  CALL e%RaiseInformation(modName//'::'//myName//' - '// &
+    & '[END] Setting time Finite Element.')
+#endif DEBUG_VER
 END IF
 
+CALL obj%SetQuadPointsInSpace()
+CALL obj%SetLocalElemShapeDataInSpace()
+
 IF (ALLOCATED(elemType)) DEALLOCATE (elemType)
 IF (ALLOCATED(order)) DEALLOCATE (order)
 
@@ -456,7 +474,7 @@
 isok = ALLOCATED(obj%facetFE)
 IF (.NOT. isok) THEN
   CALL e%RaiseError(modName//'::'//myName//' - '// &
-    & '[INTERNAL ERROR] :: AbstractKernel_::obj%cellFE not allocated')
+    & '[INTERNAL ERROR] :: AbstractKernel_::obj%facetFE not allocated')
   RETURN
 END IF