Skip to content

Commit

Permalink
Rename ressources -> resources in UWGeodynamics
Browse files Browse the repository at this point in the history
The path ressources is still symlinked for backwards compatibility.
  • Loading branch information
julesghub committed Nov 14, 2024
1 parent 21919a7 commit 096b494
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 15 deletions.
9 changes: 5 additions & 4 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
recursive-include src/underworld *py
recursive-include src/underworld/UWGeodynamics/resources *.json
recursive-include src/underworld/UWGeodynamics/uwgeo-data *

# recursive-include src/underworld *i
# recursive-include src/underworld *c
# recursive-include src/underworld *cpp
# recursive-include src/underworld *h
# recursive-include src/underworld *hpp
#recursive-include src/underworld CMakeLists*
recursive-include src/underworld *py
recursive-include src/underworld/UWGeodynamics/ressources *.json
recursive-include src/underworld/UWGeodynamics/uwgeo-data *
# recursive-include src/underworld CMakeLists*
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@
"outputs": [],
"source": [
"Model.surfaceProcesses = GEO.surfaceProcesses.Badlands(airIndex=[stickyAir.index, air.index], sedimentIndex=sediment.index,\n",
" XML=\"ressources/badlands.xml\", resolution=1. * u.kilometer, \n",
" XML=\"resources/badlands.xml\", resolution=1. * u.kilometer, \n",
" checkpoint_interval=0.01 * u.megayears)"
]
},
Expand Down
10 changes: 5 additions & 5 deletions docs/development/docs_generator/UWGeoUserGuide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ MaterialRegistry object:
from a json file by passing its path as argument.
The `default json`__ file can be used as an example.

.. _default json: https://github.com/underworldcode/UWGeodynamics/blob/master/UWGeodynamics/ressources/Materials.json_
.. _default json: https://github.com/underworldcode/UWGeodynamics/blob/master/UWGeodynamics/resources/Materials.json_



Expand Down Expand Up @@ -779,7 +779,7 @@ These can be accessed using the `GEO.ViscousCreepRegistry`:
from a json file by passing its path as argument.
The `default json`__ file can be find here and can be used as an example.

__ https://github.com/underworldcode/UWGeodynamics/blob/master/UWGeodynamics/ressources/ViscousRheologies.json_
__ https://github.com/underworldcode/UWGeodynamics/blob/master/UWGeodynamics/resources/ViscousRheologies.json_

**Example:**

Expand Down Expand Up @@ -917,7 +917,7 @@ They can be accessed using the `GEO.PlasticityRegistry` registry.
from a json file by passing its path as argument.
The `default json`__ file can be find here and can be used as an example.

__ https://github.com/underworldcode/UWGeodynamics/blob/master/UWGeodynamics/ressources/PlasticRheologies.json_
__ https://github.com/underworldcode/UWGeodynamics/blob/master/UWGeodynamics/resources/PlasticRheologies.json_

Users can define their own parametres:

Expand Down Expand Up @@ -1792,7 +1792,7 @@ UWGeodynamics provides a way to couple an Underworld model to Badlands_.
>>> sediment = GEO.Material()
>>> Model.surfaceProcesses = GEO.surfaceProcesses.Badlands(
... airIndex=[air.index], sedimentIndex=sediment.index,
... XML="ressources/badlands.xml", resolution=1. * u.kilometre,
... XML="resources/badlands.xml", resolution=1. * u.kilometre,
... checkpoint_interval=0.01 * u.megayears)
This will allow communication between the *UWGeodynamics* model and the *Badlands*
Expand Down Expand Up @@ -1823,7 +1823,7 @@ model than in the thermo-mechanical model.
.. _documentation: https://github.com/badlands-model/badlands
.. _XML example: ressources/badlands.xml
.. _XML example: resources/badlands.xml
Deforming Mesh
--------------
Expand Down
2 changes: 1 addition & 1 deletion src/underworld/UWGeodynamics/_material.py
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ def __init__(self, filename=None):

if not filename:
filename = pkg_resources.resource_filename(
__name__, "ressources/Materials.json")
__name__, "resources/Materials.json")

def get_value(item):
value = item["value"]
Expand Down
4 changes: 2 additions & 2 deletions src/underworld/UWGeodynamics/_melt.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def __init__(self, filename=None):
if not filename:
import pkg_resources
filename = pkg_resources.resource_filename(
__name__, "ressources/Solidus.json")
__name__, "resources/Solidus.json")

with open(filename, "r") as infile:
_solidii = json.load(infile)
Expand Down Expand Up @@ -111,7 +111,7 @@ def __init__(self, filename=None):
if not filename:
import pkg_resources
filename = pkg_resources.resource_filename(
__name__, "ressources/Liquidus.json")
__name__, "resources/Liquidus.json")

with open(filename, "r") as infile:
_liquidii = json.load(infile)
Expand Down
4 changes: 2 additions & 2 deletions src/underworld/UWGeodynamics/_rheology.py
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ def __init__(self, filename=None):
if not filename:
import pkg_resources
filename = pkg_resources.resource_filename(
__name__, "ressources/ViscousRheologies.json")
__name__, "resources/ViscousRheologies.json")

with open(filename, "r") as infile:
self._viscousLaws = json.load(infile)
Expand Down Expand Up @@ -686,7 +686,7 @@ def __init__(self, filename=None):
if not filename:
import pkg_resources
filename = pkg_resources.resource_filename(
__name__, "ressources/PlasticRheologies.json")
__name__, "resources/PlasticRheologies.json")

with open(filename, "r") as infile:
_plasticLaws = json.load(infile)
Expand Down
1 change: 1 addition & 0 deletions src/underworld/UWGeodynamics/ressources

0 comments on commit 096b494

Please sign in to comment.