You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit 1d602dd
Browse filesBrowse the repository at this point in the historyBrowse files
feat: choose the number of elements from the data (phase 6.4) (#141)
* feat: choose the number of interpolation elements from the data
Add suggest_nelements and summarise_data, an Automatic setting, and one
model manager method for the interpolator arguments that reads the saved
settings instead of the class defaults. The feature panel shows the number
and keeps a number that the user sets.
* fix: element count from the extent, and the Automatic check box
- Calculate the element count from the model extent as well as from the
number of data rows: the volume of the model divided by the cube of the
median spacing of the data points. Use the larger number.
- When the user selects Automatic again, show the number of the settings,
not the last number of the user.
- The check box follows the global Automatic setting. Without it, the box
uses the fixed number of the settings.
- Correct the sign of the normal in _normals_from_strike_dip.
- Add tests for interpolator_arguments and for the save and load of the
overrides.
* fix: limit the extent factor of the automatic element count
volume / spacing^3 gave the maximum (250 000) for most map data: contacts
are sampled densely along lines, so the spacing is small. The solve was
then slow.
The extent factor is now the map area of the model divided by the map
area of the data, limited to 1 .. 2.
The UI shows the lineations of the selected source in the 3D view and in
668
+
the axis S-plot, so that the user can compare the two sources.
648
669
3.**S-plot.** The user controls the rotation angle profiles: the profile
649
670
type (Fourier series, trigonometric), the wavelength, and fixed values for
650
671
the profile parameters. Without this control, the plugin fits the
@@ -654,11 +675,11 @@ user can select any combination that is in the table below.
654
675
| Axial surface | Fold axis | S-plot | Result |
655
676
|---|---|---|---|
656
677
| - | - | - | A standard foliation. No fold constraint. |
657
-
| x | - | - | Fold frame and DFI. Axial surface constraint on. The fold axis is the average intersection lineation, but the fold axis constraint is off (`fold_axis_w = None`). Automatic profiles. |
658
-
| - | x | - | No fold frame. The plugin adds the fold axis as tangent constraints on a regular grid in the bounding box (gradient . axis = 0). The interpolator of the feature does not change. Only a constant fold axis is possible. |
678
+
| x | - | - | Fold frame and DFI. Axial surface constraint on. The fold axis is the average of the calculated intersection lineations, but the fold axis constraint is off (`fold_axis_w = None`). Automatic profiles. |
679
+
| - | x | - | No fold frame. The plugin adds the fold axis as tangent constraints on a regular grid in the bounding box (gradient . axis = 0). The interpolator of the feature does not change. Only a constant fold axis is possible: plunge and azimuth, or the average of a lineation layer. |
659
680
| x | x | - | Fold frame and DFI. Both constraints on. Automatic profiles. |
660
681
| x | - | x | As "axial surface only", but with the limb profile of the user. |
661
-
| x | x | x | All constraints on. The limb profile of the user. With "lineation data", also the axis profile of the user. |
682
+
| x | x | x | All constraints on. The limb profile of the user. With lineations and "fit", also the axis profile of the user. |
662
683
| - | - | x, or - x x | Not possible. An S-plot needs a fold frame coordinate. The S-plot check box is disabled until the user selects an axial surface. The tooltip says why. |
663
684
664
685
Rules:
@@ -721,8 +742,11 @@ with orientations: `s2`, `s1` and `s0`.
721
742
stratigraphic group:
722
743
-`fold_event`: the name of the fold event, or `None`;
723
744
-`axial_surface`: on or off, and `fold_orientation` weight;
724
-
-`fold_axis`: off, `constant` (plunge, azimuth), `average`, or `data`
725
-
(layer dicts), and `fold_axis_w` weight;
745
+
-`fold_axis`: `source` (off, `constant` or `lineations`), the plunge and
746
+
azimuth for `constant`, the `fold_axis_w` weight, and for `lineations`:
747
+
-`lineation_source`: `layer` (layer dict with the plunge and trend
748
+
fields) or `intersection` (calculated);
749
+
-`use`: `average` or `fit`;
726
750
-`splot`: off or on; for the limb and for the axis profile: the type, the
727
751
wavelength (or "automatic"), and the fixed parameters;
Copy file name to clipboardExpand all lines: docs/usage/interface.md
+7Lines changed: 7 additions & 0 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -115,4 +115,11 @@ Units that don't match the stratigraphic column will have null values, helping y
115
115
Once the layers have been selected, stratigraphic column defined and the fault topology relationships set, the LoopStructural model can be initialised.
116
116
117
117
Initialise model will create a LoopStructural model with all of the geological features in the model. For each feature in the model the number of interpolation elements (degrees of freedom), the weighting of the regularisation, contact points and orientation weight can be changed.
118
+
119
+
#### Number of interpolation elements
120
+
121
+
By default the number of elements is "Automatic". The plugin chooses it for each feature from the data of the feature: more constraints, more surfaces and a wider spread of orientations give more elements. The number is rounded to 1 000 and kept between 5 000 and 250 000. The panel of the feature shows the number that was used.
122
+
123
+
- To keep a number for one feature, clear the "Automatic" check box in the panel of the feature and enter the number. The feature keeps it, and the project file saves it, until you select "Automatic" again.
124
+
- To use one fixed number for all features, clear "Automatic" in the plugin settings and enter the number. Features that you set by hand keep their own number.
0 commit comments