-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Added SMEllipticArcClass module * Added documentation for elliptic curve * Fixed minor syntax errors * Shortened warning message to suppress "Error: Line truncated" * Fixed typos * Added RotatedEllipseAnd4Circle example * Fixed more typos * Added initWithParametersNameAndID_SMEllipticArc override * Fixed typos * Corrected documentation * Changed RotatedEllipse example for coverage * Added elliptic arc to AllFeatures.control * Added RotatedEllipse example to Benchmarks * Updated documentation * Update Benchmarks/TestGeneratorControlFiles/AllFeatures.control Co-authored-by: Andrew Winters <[email protected]> * Update Documentation/docs/examples.md Co-authored-by: Andrew Winters <[email protected]> * Update Examples/2D/AllFeatures/AllFeatures.control Co-authored-by: Andrew Winters <[email protected]> * Update Benchmarks/TestGeneratorControlFiles/RotatedEllipseWithSubregions.control Co-authored-by: Andrew Winters <[email protected]> * Update Benchmarks/TestGeneratorControlFiles/RotatedEllipseWithSubregions.control Co-authored-by: Andrew Winters <[email protected]> * Update Benchmarks/TestGeneratorControlFiles/RotatedEllipseWithSubregions.control Co-authored-by: Andrew Winters <[email protected]> * Update Benchmarks/TestGeneratorControlFiles/RotatedEllipseWithSubregions.control Co-authored-by: Andrew Winters <[email protected]> * Update Examples/2D/RotatedEllipseWithSubregions/RotatedEllipseWithSubregions.control Co-authored-by: Andrew Winters <[email protected]> * Update Examples/2D/RotatedEllipseWithSubregions/RotatedEllipseWithSubregions.control Co-authored-by: Andrew Winters <[email protected]> * Update Examples/2D/RotatedEllipseWithSubregions/RotatedEllipseWithSubregions.control Co-authored-by: Andrew Winters <[email protected]> * Update Examples/2D/RotatedEllipseWithSubregions/RotatedEllipseWithSubregions.control Co-authored-by: Andrew Winters <[email protected]> * Make CircularArc inherit from EllipticArc * Added/fixed RotatedEllipse in Benchmarks directory * Updated structure to use GENERIC * Updated documentation * Fixed typo * Fixed tests * Specified missing type * Fixed typos and moved AllFeatures image * Removed initDefaultEllipse subroutine * Formatting * Added printDescription tests for line and ellipse * Update ControlFileReader.f90 Updated the control file grammar in the comments. Added the keywords used to construct an elliptic arc, etc. * Modify Curve tests Move the scratch iUnit open to test routine out of the printDescription procedure. * Update CurveTests.f90 Use newunit to generate an unused file unit. Remove extraneous lines in TestPrintDescription * Update CurveTests.f90 Fix SAVEd bug introduced in last commit. --------- Co-authored-by: Andrew Winters <[email protected]> Co-authored-by: David Kopriva <[email protected]>
- Loading branch information
3 people
authored
Nov 8, 2024
1 parent
e7ed7d0
commit 85e586d
Showing
19 changed files
with
21,594 additions
and
263 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| 1 | ||
| 2436 2674 5116 7 | ||
| 8.99660E-03 | ||
| 1.09943E+00 | ||
| 1.07198E+00 | ||
| 1.19205E+00 | ||
| 8.43429E-03 | ||
| 8.30762E+01 | ||
| 9.80230E+01 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
147 changes: 147 additions & 0 deletions
147
Benchmarks/ControlFiles/RotatedEllipseWithSubregions.control
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| \begin{CONTROL_INPUT} | ||
|
|
||
| \begin{RUN_PARAMETERS} | ||
| mesh file name = Benchmarks/MeshFiles/Tests/RotatedEllipseWithSubregions.mesh | ||
| plot file name = Benchmarks/PlotFiles/Tests/RotatedEllipseWithSubregions.tec | ||
| stats file name = Benchmarks/StatsFiles/Tests/RotatedEllipseWithSubregions.txt | ||
| test file name = Benchmarks/BenchmarkData/RotatedEllipseWithSubregions.txt | ||
| mesh file format = ISM | ||
| polynomial order = 5 | ||
| plot file format = skeleton | ||
| \end{RUN_PARAMETERS} | ||
|
|
||
| \begin{BACKGROUND_GRID} | ||
| background grid size = [0.1,0.1,0.1] | ||
| \end{BACKGROUND_GRID} | ||
|
|
||
| \begin{SPRING_SMOOTHER} | ||
| smoothing = ON | ||
| smoothing type = LinearAndCrossBarSpring | ||
| number of iterations = 10 | ||
| \end{SPRING_SMOOTHER} | ||
|
|
||
| \end{CONTROL_INPUT} | ||
|
|
||
| \begin{MODEL} | ||
|
|
||
| \begin{OUTER_BOUNDARY} | ||
| \begin{ELLIPTIC_ARC} | ||
| name = outer | ||
| center = [0.0,0.0,0.0] | ||
| xRadius = 4 | ||
| yRadius = 2 | ||
| start angle = 0.0 | ||
| end angle = 360.0 | ||
| rotation = 45.0 | ||
| units = degrees | ||
| \end{ELLIPTIC_ARC} | ||
| \end{OUTER_BOUNDARY} | ||
|
|
||
| \begin{INNER_BOUNDARIES} | ||
|
|
||
| \begin{CHAIN} | ||
| name = Inner circle 1 | ||
| \begin{PARAMETRIC_EQUATION_CURVE} | ||
| name = Circle1 | ||
| xEqn = f(t) = 0.3*cos(2*pi*t) | ||
| yEqn = f(t) = 0.5 + 0.3*sin(2*pi*t) | ||
| zEqn = z(t) = 0.0 | ||
| \end{PARAMETRIC_EQUATION_CURVE} | ||
| \end{CHAIN} | ||
|
|
||
| \begin{CHAIN} | ||
| name = Inner circle 2 | ||
| \begin{PARAMETRIC_EQUATION_CURVE} | ||
| name = Circle2 | ||
| xEqn = f(t) = -1.0 + 0.5*cos(2*pi*t) | ||
| yEqn = f(t) = 0.5*sin(2*pi*t) | ||
| zEqn = z(t) = 0.0 | ||
| \end{PARAMETRIC_EQUATION_CURVE} | ||
| \end{CHAIN} | ||
|
|
||
| \begin{CHAIN} | ||
| name = Inner circle 3 | ||
| \begin{PARAMETRIC_EQUATION_CURVE} | ||
| name = Circle3 | ||
| xEqn = f(t) = 1.0 + 0.2*cos(2*pi*t) | ||
| yEqn = f(t) = 0.2*sin(2*pi*t) | ||
| zEqn = z(t) = 0.0 | ||
| \end{PARAMETRIC_EQUATION_CURVE} | ||
| \end{CHAIN} | ||
|
|
||
| \begin{CHAIN} | ||
| name = Inner circle 4 | ||
| \begin{PARAMETRIC_EQUATION_CURVE} | ||
| name = Circle4 | ||
| xEqn = f(t) = 0.5 + 0.15*cos(2*pi*t) | ||
| yEqn = f(t) = 0.15*sin(2*pi*t) - 0.5 | ||
| zEqn = z(t) = 0.0 | ||
| \end{PARAMETRIC_EQUATION_CURVE} | ||
| \end{CHAIN} | ||
|
|
||
| \begin{CHAIN} | ||
| name = Inner Half Ellipse 1 | ||
| \begin{ELLIPTIC_ARC} | ||
| name = Ellipse1 | ||
| center = [1.5,1.5,0.0] | ||
| xRadius = 1.0 | ||
| yRadius = 0.5 | ||
| start angle = -180.0 | ||
| end angle = 0.0 | ||
| rotation = 0.0 | ||
| units = degrees | ||
| \end{ELLIPTIC_ARC} | ||
| \begin{END_POINTS_LINE} | ||
| name = E1 | ||
| xStart = [2.5,1.5,0.0] | ||
| xEnd = [0.5,1.5,0.0] | ||
| \end{END_POINTS_LINE} | ||
| \end{CHAIN} | ||
|
|
||
| \begin{CHAIN} | ||
| name = Inner Half Ellipse 2 | ||
| \begin{ELLIPTIC_ARC} | ||
| name = Ellipse2 | ||
| center = [1.5,2.0,0.0] | ||
| xRadius = 1.0 | ||
| yRadius = 0.5 | ||
| start angle = 0.0 | ||
| end angle = 3.14159265358979323846 | ||
| rotation = 0.0 | ||
| units = radians | ||
| \end{ELLIPTIC_ARC} | ||
| \begin{END_POINTS_LINE} | ||
| name = E2 | ||
| xStart = [0.5,2.0,0.0] | ||
| xEnd = [2.5,2.0,0.0] | ||
| \end{END_POINTS_LINE} | ||
| \end{CHAIN} | ||
|
|
||
| \begin{CHAIN} | ||
| name = Inner Third Ellipse | ||
| \begin{ELLIPTIC_ARC} | ||
| name = Ellipse3 | ||
| center = [-2.0,-2.0,0.0] | ||
| xRadius = 0.5 | ||
| yRadius = 1.0 | ||
| start angle = 0.0 | ||
| end angle = 90.0 | ||
| rotation = 0.0 | ||
| units = degrees | ||
| \end{ELLIPTIC_ARC} | ||
| \begin{END_POINTS_LINE} | ||
| name = E3 | ||
| xStart = [-2.0,-1.0,0.0] | ||
| xEnd = [-2.0,-2.0,0.0] | ||
| \end{END_POINTS_LINE} | ||
| \begin{END_POINTS_LINE} | ||
| name = E4 | ||
| xStart = [-2.0,-2.0,0.0] | ||
| xEnd = [-1.5,-2.0,0.0] | ||
| \end{END_POINTS_LINE} | ||
| \end{CHAIN} | ||
|
|
||
| \end{INNER_BOUNDARIES} | ||
|
|
||
| \end{MODEL} | ||
| \end{FILE} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
144 changes: 144 additions & 0 deletions
144
Benchmarks/TestGeneratorControlFiles/RotatedEllipseWithSubregions.control
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| \begin{CONTROL_INPUT} | ||
|
|
||
| \begin{RUN_PARAMETERS} | ||
| mesh file name = Benchmarks/MeshFiles/Benchmarks/RotatedEllipseWithSubregions.mesh | ||
| plot file name = Benchmarks/PlotFiles/Benchmarks/RotatedEllipseWithSubregions.tec | ||
| stats file name = Benchmarks/StatsFiles/Benchmarks/RotatedEllipseWithSubregions.txt | ||
| test file name = Benchmarks/BenchmarkData/RotatedEllipseWithSubregions.txt | ||
| mesh file format = ISM | ||
| polynomial order = 5 | ||
| plot file format = skeleton | ||
| \end{RUN_PARAMETERS} | ||
|
|
||
| \begin{BACKGROUND_GRID} | ||
| background grid size = [0.1,0.1,0.1] | ||
| \end{BACKGROUND_GRID} | ||
|
|
||
| \begin{SPRING_SMOOTHER} | ||
| smoothing = ON | ||
| smoothing type = LinearAndCrossBarSpring | ||
| number of iterations = 10 | ||
| \end{SPRING_SMOOTHER} | ||
|
|
||
| \end{CONTROL_INPUT} | ||
|
|
||
| \begin{MODEL} | ||
|
|
||
| \begin{OUTER_BOUNDARY} | ||
| \begin{ELLIPTIC_ARC} | ||
| name = outer | ||
| center = [0.0,0.0,0.0] | ||
| xRadius = 4 | ||
| yRadius = 2 | ||
| start angle = 0.0 | ||
| end angle = 360.0 | ||
| units = degrees | ||
| rotation = 45.0 | ||
| \end{ELLIPTIC_ARC} | ||
| \end{OUTER_BOUNDARY} | ||
|
|
||
| \begin{INNER_BOUNDARIES} | ||
|
|
||
| \begin{CHAIN} | ||
| name = Inner circle 1 | ||
| \begin{PARAMETRIC_EQUATION_CURVE} | ||
| name = Circle1 | ||
| xEqn = f(t) = 0.3*cos(2*pi*t) | ||
| yEqn = f(t) = 0.5 + 0.3*sin(2*pi*t) | ||
| zEqn = z(t) = 0.0 | ||
| \end{PARAMETRIC_EQUATION_CURVE} | ||
| \end{CHAIN} | ||
|
|
||
| \begin{CHAIN} | ||
| name = Inner circle 2 | ||
| \begin{PARAMETRIC_EQUATION_CURVE} | ||
| name = Circle2 | ||
| xEqn = f(t) = -1.0 + 0.5*cos(2*pi*t) | ||
| yEqn = f(t) = 0.5*sin(2*pi*t) | ||
| zEqn = z(t) = 0.0 | ||
| \end{PARAMETRIC_EQUATION_CURVE} | ||
| \end{CHAIN} | ||
|
|
||
| \begin{CHAIN} | ||
| name = Inner circle 3 | ||
| \begin{PARAMETRIC_EQUATION_CURVE} | ||
| name = Circle3 | ||
| xEqn = f(t) = 1.0 + 0.2*cos(2*pi*t) | ||
| yEqn = f(t) = 0.2*sin(2*pi*t) | ||
| zEqn = z(t) = 0.0 | ||
| \end{PARAMETRIC_EQUATION_CURVE} | ||
| \end{CHAIN} | ||
|
|
||
| \begin{CHAIN} | ||
| name = Inner circle 4 | ||
| \begin{PARAMETRIC_EQUATION_CURVE} | ||
| name = Circle4 | ||
| xEqn = f(t) = 0.5 + 0.15*cos(2*pi*t) | ||
| yEqn = f(t) = 0.15*sin(2*pi*t) - 0.5 | ||
| zEqn = z(t) = 0.0 | ||
| \end{PARAMETRIC_EQUATION_CURVE} | ||
| \end{CHAIN} | ||
|
|
||
| \begin{CHAIN} | ||
| name = Inner Half Ellipse 1 | ||
| \begin{ELLIPTIC_ARC} | ||
| name = Ellipse1 | ||
| center = [1.5,1.5,0.0] | ||
| xRadius = 1.0 | ||
| yRadius = 0.5 | ||
| start angle = -180.0 | ||
| end angle = 0.0 | ||
| units = degrees | ||
| \end{ELLIPTIC_ARC} | ||
| \begin{END_POINTS_LINE} | ||
| name = E1 | ||
| xStart = [2.5,1.5,0.0] | ||
| xEnd = [0.5,1.5,0.0] | ||
| \end{END_POINTS_LINE} | ||
| \end{CHAIN} | ||
|
|
||
| \begin{CHAIN} | ||
| name = Inner Half Ellipse 2 | ||
| \begin{ELLIPTIC_ARC} | ||
| name = Ellipse2 | ||
| center = [1.5,2.0,0.0] | ||
| xRadius = 1.0 | ||
| yRadius = 0.5 | ||
| start angle = 0.0 | ||
| end angle = 3.14159265358979323846 | ||
| units = radians | ||
| \end{ELLIPTIC_ARC} | ||
| \begin{END_POINTS_LINE} | ||
| name = E2 | ||
| xStart = [0.5,2.0,0.0] | ||
| xEnd = [2.5,2.0,0.0] | ||
| \end{END_POINTS_LINE} | ||
| \end{CHAIN} | ||
|
|
||
| \begin{CHAIN} | ||
| name = Inner Third Ellipse | ||
| \begin{ELLIPTIC_ARC} | ||
| name = Ellipse3 | ||
| center = [-2.0,-2.0,0.0] | ||
| xRadius = 0.5 | ||
| yRadius = 1.0 | ||
| start angle = 0.0 | ||
| end angle = 90.0 | ||
| units = degrees | ||
| \end{ELLIPTIC_ARC} | ||
| \begin{END_POINTS_LINE} | ||
| name = E3 | ||
| xStart = [-2.0,-1.0,0.0] | ||
| xEnd = [-2.0,-2.0,0.0] | ||
| \end{END_POINTS_LINE} | ||
| \begin{END_POINTS_LINE} | ||
| name = E4 | ||
| xStart = [-2.0,-2.0,0.0] | ||
| xEnd = [-1.5,-2.0,0.0] | ||
| \end{END_POINTS_LINE} | ||
| \end{CHAIN} | ||
|
|
||
| \end{INNER_BOUNDARIES} | ||
|
|
||
| \end{MODEL} | ||
| \end{FILE} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.