Merge remote-tracking branch 'origin/dev'

Author: vickysharma0812

docs/blog/authors.yml

@@ -6,6 +6,8 @@ vickysharma0812:
   socials:
     x: vickysharma0812
     github: vickysharma0812
+    linkedin: vickysharma0812
+    researchgate: https://www.researchgate.net/profile/Vikas-Sharma-41
 
 shishiousan:
   name: Shion Shimizu
@@ -14,3 +16,5 @@ shishiousan:
   image_url: https://raw.githubusercontent.com/easifem/authors/refs/heads/main/images/shishiousan.jpg
   socials:
     github: shishiousan
+    linkedin: shion-shimizu-838997340
+    researchgate: https://www.researchgate.net/profile/Shion-Shimizu

docs/docs-api/MassMatrix/examples/MassMatrix_test_3.F90

@@ -1,46 +1,3 @@
-<<<<<<< HEAD
----
-title: MassMatrix example 3 
-author: Vikas Sharma, Ph.D.
-date: 20 Nov 2021
-update: 20 Nov 2021 
-tags:
-    - ReferenceLine
-    - ReferenceLine/Initiate
-    - QuadraturePoint/Initiate
-    - ElemshapeData/Initiate
-    - MassMatrix
----
-
-# MassMatrix example 3
-
-!!! note ""
-This example shows how to USE the SUBROUTINE called `MassMatrix` to create a mass matrix in space domain.
-
-Here, we want to DO the following.
-
-$$
-\int_{\Omega } N^{I}\rho N^{J}d\Omega
-$$
-
-!!! warning ""
-`rho` can be a constant, or a FUNCTION of spatial coordinates, or some nonlinear FUNCTION.
-
-In this example, following mass matrix is formed for [[ReferenceLine_]] element, [[QuadraturePoint_]] are `GaussLegendre`.
-
-$$
-\int_{\Omega } N^{I} N^{J}d\Omega
-$$
-
-This TYPE of mass matrix is useful when $rho$ is a constant.
-
-## Modules and classes
-
-## Usage
-
-```fortran
-=======
->>>>>>> 8a747609 (Adding documentation of mass matrix)
 PROGRAM main
 USE easifemBase
 IMPLICIT NONE
@@ -50,76 +7,6 @@ PROGRAM main
 REAL(DFP), ALLOCATABLE :: mat(:, :), XiJ(:, :)
 INTEGER(I4B), PARAMETER :: orderFortest = 1, orderForTrial = 2
 
-<<<<<<< HEAD
-!!! note ""
-Let us now create the physical coordinate of the line element.
-
-```fortran
-XiJ = RESHAPE([-1, 1], [1, 2])
-```
-
-!!! note ""
-Now we create an instance of [[ReferenceLine_]].
-
-```fortran
-simplexElem = referenceline(nsd=1)
-CALL simplexElem%LagrangeElement(order=orderForTest, highOrderObj=refElemForTest)
-CALL simplexElem%LagrangeElement(order=orderForTrial, highOrderObj=refElemForTrial)
-```
-
-!!! note ""
-Here, we create the quadrature points.
-
-```fortran
-CALL initiate( obj=quad, refelem=simplexElem, order=orderForTest+orderForTrial, &
-    & quadratureType='GaussLegendre' )
-```
-
-!!! note ""
-Initiate an instance of [[ElemshapeData_]]. You can learn more about it from [[ElemshapeData_test]].
-
-```fortran
-CALL initiate(obj=elemsdForsimplex, &
-    & quad=quad, &
-    & refelem=simplexElem, &
-    & ContinuityType=typeH1, &
-    & InterpolType=typeLagrangeInterpolation)
-```
-
-!!! note ""
-Initiate an instance of [[ElemeshapeData_]] for test function.
-
-```fortran
-CALL initiate(obj=test, &
-    & quad=quad, &
-    & refelem=refElemForTest, &
-    & ContinuityType=typeH1, &
-    & InterpolType=typeLagrangeInterpolation)
-CALL Set(obj=test, val=xij, N=elemsdForSimplex%N, &
-    & dNdXi=elemsdForSimplex%dNdXi)
-```
-
-!!! note ""
-Initiate an instance of [[ElemeshapeData_]] for trial function.
-
-```fortran
-CALL initiate(obj=trial, &
-    & quad=quad, &
-    & refelem=refElemForTrial, &
-    & ContinuityType=typeH1, &
-    & InterpolType=typeLagrangeInterpolation)
-CALL Set(obj=trial, val=xij, N=elemsdForSimplex%N, &
-    & dNdXi=elemsdForSimplex%dNdXi)
-```
-
-!!! note ""
-Let us now create the mass matrix.
-
-```fortran
-mat=MassMatrix(test=test, trial=trial)
-CALL Display(mat, "mat:")
-```
-=======
 ! Let us now create the physical coordinate of the line element.
 
 XiJ = RESHAPE([-1, 1], [1, 2])
@@ -154,7 +41,6 @@ PROGRAM main
          dNdXi=elemsdForSimplex%dNdXi)
 
 ! Initiate an instance of [[ElemeshapeData_]] for trial function.
->>>>>>> 8a747609 (Adding documentation of mass matrix)
 
 CALL initiate(obj=trial, &
               quad=quad, &

docs/docs-api/MassMatrix/examples/MassMatrix_test_4.F90

@@ -1,46 +1,3 @@
-<<<<<<< HEAD
----
-title: MassMatrix example 4 
-author: Vikas Sharma, Ph.D.
-date: 20 Nov 2021
-update: 20 Nov 2021 
-tags:
-    - ReferenceLine
-    - ReferenceLine/Initiate
-    - QuadraturePoint/Initiate
-    - ElemshapeData/Initiate
-    - MassMatrix
----
-
-# MassMatrix example 4
-
-!!! note ""
-This example shows how to USE the SUBROUTINE called `MassMatrix` to create a mass matrix in space domain.
-
-Here, we want to DO the following.
-
-$$
-\int_{\Omega } N^{I}\rho N^{J}d\Omega
-$$
-
-!!! warning ""
-`rho` can be a constant, or a FUNCTION of spatial coordinates, or some nonlinear FUNCTION.
-
-In this example, following mass matrix is formed for [[ReferenceLine_]] element, [[QuadraturePoint_]] are `GaussLegendre`.
-
-$$
-\int_{\Omega } N^{I} N^{J}d\Omega
-$$
-
-This TYPE of mass matrix is useful when $rho$ is a constant.
-
-## Modules and classes
-
-## Usage
-
-```fortran
-=======
->>>>>>> 8a747609 (Adding documentation of mass matrix)
 PROGRAM main
 USE easifemBase
 IMPLICIT NONE
@@ -50,36 +7,6 @@ PROGRAM main
 REAL(DFP), ALLOCATABLE :: mat(:, :), XiJ(:, :)
 INTEGER(I4B), PARAMETER :: orderFortest = 1, orderForTrial = 2
 
-<<<<<<< HEAD
-!!! note ""
-Let us now create the physical coordinate of the line element.
-
-```fortran
-XiJ = RESHAPE([-1, 1], [1, 2])
-```
-
-!!! note ""
-Now we create an instance of [[ReferenceLine_]].
-
-```fortran
-simplexElem = referenceline(nsd=1)
-CALL simplexElem%LagrangeElement(order=orderForTest, highOrderObj=refElemForTest)
-CALL simplexElem%LagrangeElement(order=orderForTrial, highOrderObj=refElemForTrial)
-```
-
-!!! note ""
-Here, we create the quadrature points.
-
-```fortran
-CALL initiate( obj=quad, refelem=simplexElem, order=orderForTest+orderForTrial, &
-    & quadratureType='GaussLegendre' )
-```
-
-!!! note ""
-Initiate an instance of [[ElemshapeData_]]. You can learn more about it from [[ElemshapeData_test]].
-
-```fortran
-=======
 ! Let us now create the physical coordinate of the line element.
 
 XiJ = RESHAPE([-1, 1], [1, 2])
@@ -97,49 +24,11 @@ PROGRAM main
 
 ! Initiate an instance of [[ElemshapeData_]]. You can learn more about it from [[ElemshapeData_test]].
 
->>>>>>> 8a747609 (Adding documentation of mass matrix)
 CALL initiate(obj=elemsdForsimplex, &
     & quad=quad, &
     & refelem=simplexElem, &
     & ContinuityType=typeH1, &
     & InterpolType=typeLagrangeInterpolation)
-<<<<<<< HEAD
-```
-
-!!! note ""
-Initiate an instance of [[ElemeshapeData_]] for test function.
-
-```fortran
-CALL initiate(obj=test, &
-    & quad=quad, &
-    & refelem=refElemForTest, &
-    & ContinuityType=typeH1, &
-    & InterpolType=typeLagrangeInterpolation)
-CALL Set(obj=test, val=xij, N=elemsdForSimplex%N, &
-    & dNdXi=elemsdForSimplex%dNdXi)
-```
-
-!!! note ""
-Initiate an instance of [[ElemeshapeData_]] for trial function.
-
-```fortran
-CALL initiate(obj=trial, &
-    & quad=quad, &
-    & refelem=refElemForTrial, &
-    & ContinuityType=typeH1, &
-    & InterpolType=typeLagrangeInterpolation)
-CALL Set(obj=trial, val=xij, N=elemsdForSimplex%N, &
-    & dNdXi=elemsdForSimplex%dNdXi)
-```
-
-!!! note ""
-Let us now create the mass matrix.
-
-```fortran
-mat=MassMatrix(test=trial, trial=test)
-CALL Display(mat, "mat:")
-```
-=======
 
 ! Initiate an instance of [[ElemeshapeData_]] for test function.
 
@@ -160,7 +49,6 @@ PROGRAM main
     & InterpolType=typeLagrangeInterpolation)
 CALL Set(obj=trial, val=xij, N=elemsdForSimplex%N, &
     & dNdXi=elemsdForSimplex%dNdXi)
->>>>>>> 8a747609 (Adding documentation of mass matrix)
 
 ! Let us now create the mass matrix.