Skip to content

Commit 982fa45

Browse files
committed
Update for backsubstitution bug fix.
1 parent e5ffeaf commit 982fa45

File tree

7 files changed

+115
-117
lines changed

7 files changed

+115
-117
lines changed

src/c/expected_results/LaplaceEquation.part0.exnode

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,94 +13,94 @@
1313
0.0000000000000000E+00
1414
0.0000000000000000E+00
1515
0.0000000000000000E+00
16-
-3.2707901429383768E-01
16+
-2.6809351305219919E-01
1717
Node: 2
1818
2.0000000000000000E+00
1919
0.0000000000000000E+00
2020
0.0000000000000000E+00
2121
5.1441697033516798E-01
22-
1.0143463773488193E-01
22+
-2.2204460492503131E-16
2323
Node: 3
2424
0.0000000000000000E+00
2525
3.3333333333333331E-01
2626
0.0000000000000000E+00
2727
1.7891898861256758E-01
28-
7.1059119943811921E-01
28+
-2.2204460492503131E-16
2929
Node: 4
3030
2.0000000000000000E+00
3131
3.3333333333333331E-01
3232
0.0000000000000000E+00
3333
4.2342691170625335E-01
34-
6.2093061073913491E-01
34+
-3.3306690738754696E-16
3535
Node: 5
3636
0.0000000000000000E+00
3737
6.6666666666666663E-01
3838
0.0000000000000000E+00
3939
2.7840556692655594E-01
40-
7.1059119943811921E-01
40+
6.6613381477509392E-16
4141
Node: 6
4242
2.0000000000000000E+00
4343
6.6666666666666663E-01
4444
0.0000000000000000E+00
4545
3.5372850150917595E-01
46-
6.2093061073913502E-01
46+
-1.1102230246251565E-16
4747
Node: 7
4848
0.0000000000000000E+00
4949
1.0000000000000000E+00
5050
0.0000000000000000E+00
5151
3.4274305408244493E-01
52-
2.5370520868685476E-01
52+
-3.8857805861880479E-16
5353
Node: 8
5454
2.0000000000000000E+00
5555
1.0000000000000000E+00
5656
0.0000000000000000E+00
5757
2.6103842060345522E-01
58-
-3.4680425042767582E-02
58+
-2.2204460492503131E-16
5959
Node: 9
6060
0.0000000000000000E+00
6161
0.0000000000000000E+00
6262
3.0000000000000000E+00
6363
7.3896157939653973E-01
64-
-1.8309866618667348E-01
64+
1.1102230246251565E-16
6565
Node: 10
6666
2.0000000000000000E+00
6767
0.0000000000000000E+00
6868
3.0000000000000000E+00
6969
6.5725694591755268E-01
70-
1.4064952969343414E-01
70+
0.0000000000000000E+00
7171
Node: 11
7272
0.0000000000000000E+00
7373
3.3333333333333331E-01
7474
3.0000000000000000E+00
7575
6.4627149849081977E-01
76-
1.4088754611866103E+00
76+
-1.1102230246251565E-16
7777
Node: 12
7878
2.0000000000000000E+00
7979
3.3333333333333331E-01
8080
3.0000000000000000E+00
8181
7.2159443307344184E-01
82-
1.2147895567375782E+00
82+
8.8817841970012523E-16
8383
Node: 13
8484
0.0000000000000000E+00
8585
6.6666666666666663E-01
8686
3.0000000000000000E+00
8787
5.7657308829374232E-01
88-
1.4088754611866103E+00
88+
0.0000000000000000E+00
8989
Node: 14
9090
2.0000000000000000E+00
9191
6.6666666666666663E-01
9292
3.0000000000000000E+00
9393
8.2108101138743061E-01
94-
1.2147895567375782E+00
94+
-4.4408920985006262E-16
9595
Node: 15
9696
0.0000000000000000E+00
9797
1.0000000000000000E+00
9898
3.0000000000000000E+00
9999
4.8558302966482708E-01
100-
1.6240457247709605E-01
100+
0.0000000000000000E+00
101101
Node: 16
102102
2.0000000000000000E+00
103103
1.0000000000000000E+00
104104
3.0000000000000000E+00
105105
1.0000000000000000E+00
106-
-1.1333584306898714E-01
106+
2.6809351305220197E-01

src/fortran/expected_results/LaplaceEquation.part0.exnode

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,94 +13,94 @@
1313
0.0000000000000000E+00
1414
0.0000000000000000E+00
1515
0.0000000000000000E+00
16-
-3.2707901429383768E-01
16+
-2.6809351305219997E-01
1717
Node: 2
1818
2.0000000000000000E+00
1919
0.0000000000000000E+00
2020
0.0000000000000000E+00
21-
5.1441697033516798E-01
22-
1.0143463773488193E-01
21+
5.1441697033516887E-01
22+
8.8817841970012523E-16
2323
Node: 3
2424
0.0000000000000000E+00
2525
3.3333333333333331E-01
2626
0.0000000000000000E+00
27-
1.7891898861256758E-01
28-
7.1059119943811921E-01
27+
1.7891898861256827E-01
28+
3.2196467714129540E-15
2929
Node: 4
3030
2.0000000000000000E+00
3131
3.3333333333333331E-01
3232
0.0000000000000000E+00
3333
4.2342691170625335E-01
34-
6.2093061073913491E-01
34+
-1.1102230246251565E-15
3535
Node: 5
3636
0.0000000000000000E+00
3737
6.6666666666666663E-01
3838
0.0000000000000000E+00
39-
2.7840556692655594E-01
40-
7.1059119943811921E-01
39+
2.7840556692655516E-01
40+
-1.5543122344752192E-15
4141
Node: 6
4242
2.0000000000000000E+00
4343
6.6666666666666663E-01
4444
0.0000000000000000E+00
45-
3.5372850150917595E-01
46-
6.2093061073913502E-01
45+
3.5372850150917712E-01
46+
1.9984014443252818E-15
4747
Node: 7
4848
0.0000000000000000E+00
4949
1.0000000000000000E+00
5050
0.0000000000000000E+00
51-
3.4274305408244493E-01
52-
2.5370520868685476E-01
51+
3.4274305408244438E-01
52+
-9.4368957093138306E-16
5353
Node: 8
5454
2.0000000000000000E+00
5555
1.0000000000000000E+00
5656
0.0000000000000000E+00
57-
2.6103842060345522E-01
58-
-3.4680425042767582E-02
57+
2.6103842060345495E-01
58+
-2.2204460492503131E-15
5959
Node: 9
6060
0.0000000000000000E+00
6161
0.0000000000000000E+00
6262
3.0000000000000000E+00
63-
7.3896157939653973E-01
64-
-1.8309866618667348E-01
63+
7.3896157939654039E-01
64+
-3.3306690738754696E-16
6565
Node: 10
6666
2.0000000000000000E+00
6767
0.0000000000000000E+00
6868
3.0000000000000000E+00
69-
6.5725694591755268E-01
70-
1.4064952969343414E-01
69+
6.5725694591755346E-01
70+
4.4408920985006262E-16
7171
Node: 11
7272
0.0000000000000000E+00
7373
3.3333333333333331E-01
7474
3.0000000000000000E+00
75-
6.4627149849081977E-01
76-
1.4088754611866103E+00
75+
6.4627149849082066E-01
76+
2.9976021664879227E-15
7777
Node: 12
7878
2.0000000000000000E+00
7979
3.3333333333333331E-01
8080
3.0000000000000000E+00
81-
7.2159443307344184E-01
82-
1.2147895567375782E+00
81+
7.2159443307344251E-01
82+
1.7763568394002505E-15
8383
Node: 13
8484
0.0000000000000000E+00
8585
6.6666666666666663E-01
8686
3.0000000000000000E+00
87-
5.7657308829374232E-01
88-
1.4088754611866103E+00
87+
5.7657308829374310E-01
88+
-2.6645352591003757E-15
8989
Node: 14
9090
2.0000000000000000E+00
9191
6.6666666666666663E-01
9292
3.0000000000000000E+00
93-
8.2108101138743061E-01
94-
1.2147895567375782E+00
93+
8.2108101138743017E-01
94+
-1.9984014443252818E-15
9595
Node: 15
9696
0.0000000000000000E+00
9797
1.0000000000000000E+00
9898
3.0000000000000000E+00
99-
4.8558302966482708E-01
100-
1.6240457247709605E-01
99+
4.8558302966482819E-01
100+
8.8817841970012523E-16
101101
Node: 16
102102
2.0000000000000000E+00
103103
1.0000000000000000E+00
104104
3.0000000000000000E+00
105105
1.0000000000000000E+00
106-
-1.1333584306898714E-01
106+
2.6809351305220153E-01

src/fortran/laplace_equation.F90

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,14 @@ PROGRAM LaplaceEquation
215215
!Create a decomposition
216216
CALL cmfe_Decomposition_Initialise(decomposition,err)
217217
CALL cmfe_Decomposition_CreateStart(DECOMPOSITION_USER_NUMBER,mesh,decomposition,err)
218-
! Set the decomposition to be a general decomposition with the specified number of domains
218+
!Set the decomposition to be a general decomposition with the specified number of domains
219219
CALL cmfe_Decomposition_TypeSet(decomposition,CMFE_DECOMPOSITION_CALCULATED_TYPE,err)
220220
CALL cmfe_Decomposition_NumberOfDomainsSet(decomposition,numberOfComputationalNodes,err)
221221
!Finish the decomposition
222222
CALL cmfe_Decomposition_CreateFinish(decomposition,err)
223223

224224
!Destory the mesh now that we have decomposed it
225-
! CALL cmfe_Mesh_Destroy(mesh,err)
225+
!CALL cmfe_Mesh_Destroy(mesh,err)
226226

227227
!-----------------------------------------------------------------------------------------------------------
228228
! GEOMETRIC FIELD
@@ -284,12 +284,12 @@ PROGRAM LaplaceEquation
284284
CALL cmfe_EquationsSet_EquationsCreateStart(equationsSet,equations,err)
285285
!Set the equations matrices sparsity type
286286
CALL cmfe_Equations_SparsityTypeSet(equations,CMFE_EQUATIONS_SPARSE_MATRICES,err)
287-
! CALL cmfe_Equations_SparsityTypeSet(equations,CMFE_EQUATIONS_FULL_MATRICES,err)
287+
!CALL cmfe_Equations_SparsityTypeSet(equations,CMFE_EQUATIONS_FULL_MATRICES,err)
288288
!Set the equations set output
289-
CALL cmfe_Equations_OutputTypeSet(equations,CMFE_EQUATIONS_NO_OUTPUT,err)
290-
! CALL cmfe_Equations_OutputTypeSet(equations,CMFE_EQUATIONS_TIMING_OUTPUT,err)
291-
! CALL cmfe_Equations_OutputTypeSet(equations,CMFE_EQUATIONS_MATRIX_OUTPUT,err)
292-
! CALL cmfe_Equations_OutputTypeSet(equations,CMFE_EQUATIONS_ELEMENT_MATRIX_OUTPUT,err)
289+
!CALL cmfe_Equations_OutputTypeSet(equations,CMFE_EQUATIONS_NO_OUTPUT,err)
290+
!CALL cmfe_Equations_OutputTypeSet(equations,CMFE_EQUATIONS_TIMING_OUTPUT,err)
291+
!CALL cmfe_Equations_OutputTypeSet(equations,CMFE_EQUATIONS_MATRIX_OUTPUT,err)
292+
CALL cmfe_Equations_OutputTypeSet(equations,CMFE_EQUATIONS_ELEMENT_MATRIX_OUTPUT,err)
293293
!Finish the equations set equations
294294
CALL cmfe_EquationsSet_EquationsCreateFinish(equationsSet,err)
295295

@@ -317,23 +317,22 @@ PROGRAM LaplaceEquation
317317
CALL cmfe_Solver_Initialise(solver,err)
318318
CALL cmfe_Problem_SolversCreateStart(problem,err)
319319
CALL cmfe_Problem_SolverGet(problem,CMFE_CONTROL_LOOP_NODE,1,solver,err)
320-
CALL cmfe_Solver_OutputTypeSet(solver,CMFE_SOLVER_NO_OUTPUT,err)
321-
! CALL cmfe_Solver_OutputTypeSet(solver,CMFE_SOLVER_PROGRESS_OUTPUT,err)
322-
! CALL cmfe_Solver_OutputTypeSet(solver,CMFE_SOLVER_TIMING_OUTPUT,err)
323-
! CALL cmfe_Solver_OutputTypeSet(solver,CMFE_SOLVER_SOLVER_OUTPUT,err)
324-
! CALL cmfe_Solver_OutputTypeSet(solver,CMFE_SOLVER_MATRIX_OUTPUT,err)
325-
326-
! CALL cmfe_Solver_LinearTypeSet(solver,CMFE_SOLVER_LINEAR_ITERATIVE_SOLVE_TYPE,err)
327-
! CALL cmfe_Solver_LinearIterativeAbsoluteToleranceSet(solver,1.0E-12_CMISSRP,err)
328-
! CALL cmfe_Solver_LinearIterativeRelativeToleranceSet(solver,1.0E-12_CMISSRP,err)
329-
330-
CALL cmfe_Solver_LinearTypeSet(solver,CMFE_SOLVER_LINEAR_DIRECT_SOLVE_TYPE,err)
331-
332-
! CALL cmfe_Solver_LinearTypeSet(solver,CMFE_SOLVER_LINEAR_DIRECT_SOLVE_TYPE,err)
333-
! CALL cmfe_Solver_LibraryTypeSet(solver,CMFE_SOLVER_MUMPS_LIBRARY,err)
334-
! CALL cmfe_Solver_LibraryTypeSet(solver,CMFE_SOLVER_LAPACK_LIBRARY,err)
335-
! CALL cmfe_Solver_LibraryTypeSet(solver,CMFE_SOLVER_SUPERLU_LIBRARY,err)
336-
! CALL cmfe_Solver_LibraryTypeSet(solver,CMFE_SOLVER_PASTIX_LIBRARY,err)
320+
!CALL cmfe_Solver_OutputTypeSet(solver,CMFE_SOLVER_NO_OUTPUT,err)
321+
!CALL cmfe_Solver_OutputTypeSet(solver,CMFE_SOLVER_PROGRESS_OUTPUT,err)
322+
!CALL cmfe_Solver_OutputTypeSet(solver,CMFE_SOLVER_TIMING_OUTPUT,err)
323+
!CALL cmfe_Solver_OutputTypeSet(solver,CMFE_SOLVER_SOLVER_OUTPUT,err)
324+
CALL cmfe_Solver_OutputTypeSet(solver,CMFE_SOLVER_MATRIX_OUTPUT,err)
325+
326+
CALL cmfe_Solver_LinearTypeSet(solver,CMFE_SOLVER_LINEAR_ITERATIVE_SOLVE_TYPE,err)
327+
CALL cmfe_Solver_LinearIterativeAbsoluteToleranceSet(solver,1.0E-12_CMISSRP,err)
328+
CALL cmfe_Solver_LinearIterativeRelativeToleranceSet(solver,1.0E-12_CMISSRP,err)
329+
330+
!CALL cmfe_Solver_LinearTypeSet(solver,CMFE_SOLVER_LINEAR_DIRECT_SOLVE_TYPE,err)
331+
!CALL cmfe_Solver_LinearTypeSet(solver,CMFE_SOLVER_LINEAR_DIRECT_SOLVE_TYPE,err)
332+
!CALL cmfe_Solver_LibraryTypeSet(solver,CMFE_SOLVER_MUMPS_LIBRARY,err)
333+
!CALL cmfe_Solver_LibraryTypeSet(solver,CMFE_SOLVER_LAPACK_LIBRARY,err)
334+
!CALL cmfe_Solver_LibraryTypeSet(solver,CMFE_SOLVER_SUPERLU_LIBRARY,err)
335+
!CALL cmfe_Solver_LibraryTypeSet(solver,CMFE_SOLVER_PASTIX_LIBRARY,err)
337336
!Finish the creation of the problem solver
338337
CALL cmfe_Problem_SolversCreateFinish(problem,err)
339338

0 commit comments

Comments
 (0)