Skip to content

Commit

Permalink
Update SMSplineCurveClass.f90 (#62)
Browse files Browse the repository at this point in the history
* Update SMSplineCurveClass.f90

Replace FMM routines spline & seval with new ones.

* AddExceptionsToSpline

Add exceptions thrown if the spline has fewer than 4 points.

* Update Makefile

Update makefile for addition of exception to spline class.

* Update SMModel.f90

Add error return for spline.

* FMinReplacement

Consolidate and replace the fmin implementation. At this point, the replacement meshes all the 23 tests, but gives slightly different answers on a number of them, indicating that the results are slightly different than the original FMM implementation.

* LicenseMod

Remove references in the license to code no longer used in the project.

* fix typos in author names

* UseNewFMin

At "row end" corners, use average to find new node along the boundary instead of FMin. Use the new Fmin in MeshBoundaryMethods instead of the hack to circumvent class/type bug.

* EditOutdatedLicense

Remove last of the references to FMM in the license. Some meshes are slightly different due to the changes in the minimizations and so those will fail until the benchmarks are updated.

* Update Makefile

Remove references to the old fmin file/module

* Delete fmin.f90

The FMM version of fmin is no longer needed.

* adjust spacing in new comments

* ensure that 'none' is used anytime an output file should not be created in the existing control files

* Update SMCurveClass.f90

Change double precision to RP.

* Update MeshProject.f90

Move all "none" to lowercase.

* Update floating point testing (#66)

* AddAbsErrorTests

Add absolute error to all floating point tests.

* UpdatedBenchmarks

Rplace outdated benchmark results with new ones computed using the new spline/fmin routines.

* fix incorrect meshfile format in 2D EastCoastUS example

* bug fix: material ID must be printed in the skeleton TecPlot and not SEM TecPlot

* add that 3D nodes also carry the materialID

* update printing of skeleton TecPlot in 3D

* add another 3D extrusion test that previously failed due to floating point comparison issues

* adjust to print the material ID element-wise for better plotting

* remove the 'materialID' variable from the node class. only the element stores its material ID

* Update MeshOutputMethods.f90

Return printing of node positions to writing the skeleton in 2D

* revert SimpleSweep file

---------

Co-authored-by: Andrew Winters <[email protected]>

---------

Co-authored-by: Andrew Winters <[email protected]>
  • Loading branch information
DavidAKopriva and andrewwinters5000 authored Jun 30, 2023
1 parent b13a18c commit 3a717ef
Show file tree
Hide file tree
Showing 155 changed files with 1,223,549 additions and 592,773 deletions.
14 changes: 7 additions & 7 deletions Benchmarks/BenchmarkData/AllFeatures.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
1
1
1690 1833 3525 2
3.07838E-01
1.22505E+00
1.14758E+00
1.44202E+00
2.39576E-01
7.46330E+01
1.07658E+02
1.22496E+00
1.14753E+00
1.44190E+00
2.39601E-01
7.46320E+01
1.07656E+02
14 changes: 7 additions & 7 deletions Benchmarks/BenchmarkData/BoneAndMarrow.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
1
928 981 1908 32
6.63085E-01
1.29978E+00
1.24997E+00
1.59841E+00
5.77191E-01
7.51006E+01
1.06506E+02
6.63086E-01
1.29974E+00
1.24992E+00
1.59842E+00
5.77207E-01
7.51017E+01
1.06507E+02
8 changes: 8 additions & 0 deletions Benchmarks/BenchmarkData/Box3DRotated.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
2
150 252
1.00000E+00
2.58819E+00
2.00000E+00
6.55346E-01
1.16573E-16
2.25000E+00
14 changes: 7 additions & 7 deletions Benchmarks/BenchmarkData/Circles3Benchmark.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
1
1
421 485 908 1
1.38420E+00
1.28309E+00
1.19223E+00
1.57277E+00
1.04365E+00
7.10383E+01
1.11621E+02
1.28311E+00
1.19225E+00
1.57279E+00
1.04363E+00
7.10372E+01
1.11620E+02
14 changes: 7 additions & 7 deletions Benchmarks/BenchmarkData/GingerbreadBenchmark.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
1
1
1010 1186 2201 2
1.26107E+00
1.28826E+00
1.19418E+00
1.57161E+00
9.95093E-01
7.10406E+01
1.26106E+00
1.28821E+00
1.19420E+00
1.57163E+00
9.95071E-01
7.10403E+01
1.11331E+02
12 changes: 6 additions & 6 deletions Benchmarks/BenchmarkData/HalfCircle3DRBenchmark.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
2
306 462
9.68461E-01
3.12881E+00
3.92395E-01
6.38969E-01
9.30021E-02
5.36813E-01
9.67009E-01
3.11936E+00
3.92290E-01
6.39401E-01
9.30153E-02
5.36944E-01
16 changes: 8 additions & 8 deletions Benchmarks/BenchmarkData/HalfCircleBenchmark.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
1
1
426 473 898 0
5.89676E-02
1.05437E+00
1.02809E+00
1.10402E+00
5.65190E-02
8.59196E+01
9.48573E+01
5.89678E-02
1.05369E+00
1.02793E+00
1.10260E+00
5.65656E-02
8.59605E+01
9.48078E+01
12 changes: 6 additions & 6 deletions Benchmarks/BenchmarkData/HalfCircleExtBenchmark.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
2
204 330
9.59694E-01
1.73251E+00
4.15022E-01
8.56197E-01
9.24916E-02
4.88786E-01
9.59649E-01
1.72720E+00
4.16281E-01
8.57298E-01
9.24078E-02
4.88872E-01
12 changes: 6 additions & 6 deletions Benchmarks/BenchmarkData/IceCreamConeWHole.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
1
384 454 839 1
1.16737E-01
1.22944E+00
1.14467E+00
1.44127E+00
9.73972E-02
7.43714E+01
1.07982E+02
1.22951E+00
1.14473E+00
1.44130E+00
9.73932E-02
7.43684E+01
1.07980E+02
8 changes: 4 additions & 4 deletions Benchmarks/BenchmarkData/NACA0012.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
1
1
692 755 1447 1
2.31202E+00
1.19741E+00
1.13488E+00
1.41234E+00
1.13487E+00
1.41233E+00
2.25520E+00
7.82755E+01
7.82753E+01
1.02874E+02
14 changes: 7 additions & 7 deletions Benchmarks/BenchmarkData/Pill.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
1
1
657 771 1430 4
1.69415E-03
1.24086E+00
1.17427E+00
1.49312E+00
1.42783E-03
7.36095E+01
1.07718E+02
1.24081E+00
1.17422E+00
1.49304E+00
1.42784E-03
7.36118E+01
1.07717E+02
12 changes: 6 additions & 6 deletions Benchmarks/BenchmarkData/Pond.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
2
412 610
8.75287E-01
1.46245E+00
2.75374E-01
8.98911E-01
1.58062E-01
3.30209E-01
8.75277E-01
1.46258E+00
2.75357E-01
8.98893E-01
1.58086E-01
3.30208E-01
12 changes: 6 additions & 6 deletions Benchmarks/BenchmarkData/SeaMount.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
2
728 1005
8.24889E-01
1.99958E+00
1.65155E-01
7.74298E-01
2.33864E-01
2.01488E-01
8.24881E-01
1.99965E+00
1.65152E-01
7.74288E-01
2.33881E-01
2.01487E-01
12 changes: 6 additions & 6 deletions Benchmarks/BenchmarkData/SeaMountCubic.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
2
528 755
8.38472E-01
1.51033E+00
2.16944E-01
8.74854E-01
1.96400E-01
2.65868E-01
8.38454E-01
1.51042E+00
2.16931E-01
8.74839E-01
1.96438E-01
2.65867E-01
14 changes: 7 additions & 7 deletions Benchmarks/BenchmarkData/Segmented.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
1
1
447 526 973 3
1.95190E-02
1.24509E+00
1.16684E+00
1.47374E+00
1.56631E-02
7.35674E+01
1.08588E+02
1.24450E+00
1.16581E+00
1.47108E+00
1.56826E-02
7.36402E+01
1.08569E+02
12 changes: 6 additions & 6 deletions Benchmarks/BenchmarkData/SigmoidSweepAndScale.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
2
1400 1794
9.55389E-01
3.51397E+00
7.27103E-03
5.44166E-01
9.41815E-02
9.09321E-03
9.55385E-01
3.51406E+00
7.27091E-03
5.44161E-01
9.41954E-02
9.09320E-03
16 changes: 8 additions & 8 deletions Benchmarks/BenchmarkData/SplineBenchmark.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
1
1
129 158 286 0
5.64831E-01
1.27215E+00
1.17119E+00
1.49749E+00
4.29777E-01
7.29024E+01
1.10153E+02
5.64839E-01
1.27230E+00
1.17154E+00
1.49805E+00
4.29741E-01
7.28942E+01
1.10159E+02
16 changes: 8 additions & 8 deletions Benchmarks/BenchmarkData/abaqus_ice_cream_cone.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
1
1
216 256 472 0
8.62942E-01
1.16029E+00
1.08691E+00
1.31141E+00
7.44735E-01
7.84232E+01
1.03818E+02
8.62941E-01
1.16038E+00
1.08697E+00
1.31137E+00
7.44695E-01
7.84171E+01
1.03814E+02
1 change: 1 addition & 0 deletions Benchmarks/BenchmarkFiles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ Benchmarks/ControlFiles/ABAQUS_IceCreamCone.control
Benchmarks/ControlFiles/SeaMount.control
Benchmarks/ControlFiles/SeaMountCubic.control
Benchmarks/ControlFiles/Box3D.control
Benchmarks/ControlFiles/Box3DRotated.control
Benchmarks/ControlFiles/BoneAndMarrow.control
41 changes: 41 additions & 0 deletions Benchmarks/ControlFiles/Box3DRotated.control
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
%
% This control file uses no model and so generates a structured mesh
% in a box. The mesh size and position is given by the BackgroundGrid
% block. The background grid size is ignored when a BackgroundGrid block
% is present.
%
\begin{CONTROL_INPUT}

\begin{RUN_PARAMETERS}
mesh file name = Benchmarks/MeshFiles/Tests/Box3DRotated.mesh
plot file name = Benchmarks/PlotFiles/Tests/Box3DRotated.tec
stats file name = Benchmarks/StatsFiles/Tests/Box3DRotated.txt
test file name = Benchmarks/BenchmarkData/Box3DRotated.txt
mesh file format = ISM
polynomial order = 4
plot file format = sem
\end{RUN_PARAMETERS}

\begin{SIMPLE_ROTATION}
direction = 1
rotation angle factor = 1.0
subdivisions = 6
start surface name = start
end surface name = end
\end{SIMPLE_ROTATION}

\begin{BACKGROUND_GRID}
x0 = [0.0, 2.0, 0.0]
dx = [1.0, 1.0, 1.0]
N = [5,5,5]
\end{BACKGROUND_GRID}

\begin{SPRING_SMOOTHER}
smoothing = OFF
smoothing type = LinearAndCrossBarSpring
number of iterations = 5
\end{SPRING_SMOOTHER}

\end{CONTROL_INPUT}

\end{FILE}
2 changes: 1 addition & 1 deletion Benchmarks/ControlFiles/HalfCircleExtrude.control
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
\begin{RUN_PARAMETERS}
mesh file name = Benchmarks/MeshFiles/Tests/HalfCircleExtrude.mesh
plot file name = Benchmarks/PlotFiles/Tests/HalfCircleExtrude.tec
stats file name = None
stats file name = none
test file name = Benchmarks/BenchmarkData/HalfCircleExtBenchmark.txt
mesh file format = ISM
polynomial order = 5
Expand Down
2 changes: 1 addition & 1 deletion Benchmarks/ControlFiles/sigmoidScale.control
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
\begin{RUN_PARAMETERS}
mesh file name = Benchmarks/MeshFiles/Tests/SigmoidSweepAndScale.mesh
plot file name = Benchmarks/PlotFiles/Tests/SigmoidSweepAndScale.tec
stats file name = None
stats file name = none
test file name = Benchmarks/BenchmarkData/SigmoidSweepAndScale.txt
mesh file format = ISM
polynomial order = 4
Expand Down
Loading

0 comments on commit 3a717ef

Please sign in to comment.