Skip to content

Commit 24bc461

Browse files
Merge pull request #105 from baagaard-usgs/feature-elasticity-scales
Move nondimensionalization to PyLith
2 parents 3fa7186 + 023763b commit 24bc461

34 files changed

+25
-1647
lines changed

configure.ac

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ AC_CONFIG_FILES([Makefile
145145
modulesrc/include/Makefile
146146
modulesrc/geocoords/Makefile
147147
modulesrc/spatialdb/Makefile
148-
modulesrc/units/Makefile
149148
modulesrc/utils/Makefile
150149
spatialdata/Makefile
151150
tests/Makefile
@@ -160,7 +159,6 @@ AC_CONFIG_FILES([Makefile
160159
tests/pytests/geocoords/Makefile
161160
tests/pytests/spatialdb/Makefile
162161
tests/pytests/spatialdb/data/Makefile
163-
tests/pytests/units/Makefile
164162
tests/pytests/utils/Makefile
165163
templates/Makefile
166164
docs/Makefile])

docs/Makefile.am

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ dist_noinst_DATA = \
4444
user/components/geocoords/index.md \
4545
user/components/geocoords/CSCart.md \
4646
user/components/geocoords/CoordSys.md \
47-
user/components/units/NondimElasticQuasistatic.md \
47+
user/components/units/QuasistaticElasticity.md \
4848
user/components/units/index.md \
49-
user/components/units/NondimElasticDynamic.md \
50-
user/components/units/Nondimensional.md \
49+
user/components/units/DynamicElasticity.md \
50+
user/components/units/Scales.md \
5151
user/components/spatialdb/SimpleGridDB.md \
5252
user/components/spatialdb/CompositeDB.md \
5353
user/components/spatialdb/SimpleDB.md \
@@ -65,7 +65,6 @@ dist_noinst_DATA = \
6565
user/components/spatialdb/SCECCVMH.md \
6666
user/components/spatialdb/UniformDB.md \
6767
user/components/spatialdb/SimpleIOAscii.md \
68-
user/nondimensionalization.md \
6968
user/spatialdb/simplegriddb.md \
7069
user/spatialdb/overview.md \
7170
user/spatialdb/compositedb.md \

docs/user/components/implementations.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,3 @@
3939
[`TimeHistory`](spatialdb/TimeHistory.md)
4040
: User-specified time history using a file.
4141

42-
## Nondimensionalization
43-
44-
[`NondimElasticQuasistatic`](units/NondimElasticQuasistatic.md)
45-
: Nondimensional length scales in terms of quasistatic parameters.
46-
47-
[`NondimElasticDynamic`](units/NondimElasticDynamic.md)
48-
: Nondimensional length scales in terms of dynamic parameters.

docs/user/components/units/NondimElasticDynamic.md renamed to docs/user/components/units/DynamicElasticity.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# NondimElasticDynamic
1+
# DynamicElasticity
22

33
% WARNING: Do not edit; this is a generated file!
4-
:Full name: `spatialdata.units.NondimElasticDynamic`
5-
:Journal name: `nondimelasticdynamic`
4+
:Full name: `spatialdata.units.DynamicElasticity`
5+
:Journal name: `DynamicElasticity`
66

77
Convenience object for nondimensionalizing dynamic elasticity problems.
88

9-
Implements `Nondimensional`.
9+
Implements `Scales`.
1010

1111
## Pyre Properties
1212

@@ -25,7 +25,7 @@ Implements `Nondimensional`.
2525

2626
## Example
2727

28-
Example of setting `NondimElasticDynamic` Pyre properties and facilities in a parameter file.
28+
Example of setting `DynamicElasticity` Pyre properties and facilities in a parameter file.
2929

3030
:::{code-block} cfg
3131
[normalizer]

docs/user/components/units/NondimElasticQuasistatic.md renamed to docs/user/components/units/QuasistaticElasticity.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# NondimElasticQuasistatic
1+
# QuasistaticElasticity
22

33
% WARNING: Do not edit; this is a generated file!
4-
:Full name: `spatialdata.units.NondimElasticQuasistatic`
5-
:Journal name: `nondimelasticquasistatic`
4+
:Full name: `spatialdata.units.QuasistaticElasticity`
5+
:Journal name: `QuasistaticElasticity`
66

77
Convenience object for nondimensionalizing quasi-static elasticity problems.
88

9-
Implements `Nondimensional`.
9+
Implements `Scales`.
1010

1111
## Pyre Properties
1212

@@ -25,7 +25,7 @@ Implements `Nondimensional`.
2525

2626
## Example
2727

28-
Example of setting `NondimElasticQuasistatic` Pyre properties and facilities in a parameter file.
28+
Example of setting `QuasistaticElasticity` Pyre properties and facilities in a parameter file.
2929

3030
:::{code-block} cfg
3131
[normalizer]
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Nondimensional
1+
# Scales
22

33
% WARNING: Do not edit; this is a generated file!
4-
:Full name: `spatialdata.units.Nondimensional`
5-
:Journal name: `nondimensional`
4+
:Full name: `spatialdata.units.Scales`
5+
:Journal name: `Scales`
66

77
Abstract base class for nondimensionalizing problems.
88

docs/user/components/units/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
---
77
maxdepth: 1
88
---
9-
NondimElasticDynamic.md
10-
NondimElasticQuasistatic.md
11-
Nondimensional.md
9+
DynamicElasticity.md
10+
QuasistaticElasticity.md
11+
Scales.md
1212
:::

docs/user/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# User Guide
22

33
:::{toctree}
4-
nondimensionalization.md
54
coordsys.md
65
spatialdb/index.md
76
timedb/index.md

docs/user/nondimensionalization.md

Lines changed: 0 additions & 65 deletions
This file was deleted.

libsrc/spatialdata/Makefile.am

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ libspatialdata_la_SOURCES = \
4242
spatialdb/UniformDB.cc \
4343
spatialdb/UserFunctionDB.cc \
4444
spatialdb/cspatialdb.cc \
45-
units/Nondimensional.cc \
4645
units/Parser.cc \
4746
utils/LineParser.cc \
4847
utils/PointsStream.cc \

0 commit comments

Comments
 (0)