Skip to content

Commit

Permalink
Merge pull request #153 from lanl/swtich-to-fierromechanics
Browse files Browse the repository at this point in the history
swap out kwelsh-lanl for fierromechanics everywhere
  • Loading branch information
nathanielmorgan authored Dec 20, 2023
2 parents e2a2f1c + 335e100 commit 75f1b0f
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .conda/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ This will tell conda-build to do all of the build configurations specified by ou
### Metapackages
Metapackages are packages that contain no installable content or build instructions, but only contain metadata. The can range from completely useless to useful shortcuts for pulling in a number of packages, or complicated/specific package dependencies. We use metapackages to make it easy to set up the development environments for Fierro and EVPFFT. Our dev packages (Fierro-dev, EVPFFT-dev) only contain runtime dependencies, and are created so you can run something like:
```
conda create -n fierro-dev fierro-dev -c kwelsh-lanl -c conda-forge
conda create -n fierro-dev fierro-dev -c fierromechanics -c conda-forge
conda activate fierro-dev
```
And then you have all of the dependencies necessary to successfully build Fierro from source.
Expand Down
2 changes: 1 addition & 1 deletion .conda/elements/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ about:

extra:
recipe-maintainers:
- kwelsh-lanl
- fierromechanics
2 changes: 1 addition & 1 deletion .conda/evpfft-dev/cpu/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ about:

extra:
recipe-maintainers:
- kwelsh-lanl
- fierromechanics
2 changes: 1 addition & 1 deletion .conda/evpfft/cpu/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ about:

extra:
recipe-maintainers:
- kwelsh-lanl
- fierromechanics
2 changes: 1 addition & 1 deletion .conda/evpfft/cuda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ about:

extra:
recipe-maintainers:
- kwelsh-lanl
- fierromechanics
2 changes: 1 addition & 1 deletion .conda/fierro-dev/cpu/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ about:

extra:
recipe-maintainers:
- kwelsh-lanl
- fierromechanics
2 changes: 1 addition & 1 deletion .conda/fierro/cpu/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ about:

extra:
recipe-maintainers:
- kwelsh-lanl
- fierromechanics
2 changes: 1 addition & 1 deletion .conda/heffte/cpu/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ about:

extra:
recipe-maintainers:
- kwelsh-lanl
- fierromechanics
2 changes: 1 addition & 1 deletion .conda/heffte/cuda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ about:

extra:
recipe-maintainers:
- kwelsh-lanl
- fierromechanics
2 changes: 1 addition & 1 deletion .conda/trilinos/cpu/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ about:

extra:
recipe-maintainers:
- kwelsh-lanl
- fierromechanics
2 changes: 1 addition & 1 deletion .conda/trilinos/cuda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ about:

extra:
recipe-maintainers:
- kwelsh-lanl
- fierromechanics
2 changes: 1 addition & 1 deletion .etc/conda_build_environment.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: build-env
channels:
- conda-forge
- kwelsh-lanl
- fierromechanics
- defaults
dependencies:
- boa # For building
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
The recommended way to use **Fierro** is through the provided Anaconda package and command line utility. To use the anaconda package, follow the steps for your platform to install [anaconda](https://docs.anaconda.com/free/anaconda/install/index.html)/[miniconda](https://docs.conda.io/en/latest/miniconda.html)/[mamba](https://mamba.readthedocs.io/en/latest/installation.html). Then run the following command in your desired Anaconda environment:

```
conda install fierro-cpu -c kwelsh-lanl -c conda-forge
conda install fierro-cpu -c fierromechanics -c conda-forge
```

This will give you access to the **Fierro** command line interface. You can run the following to check that the package was installed correctly:
Expand All @@ -30,7 +30,7 @@ The classical ideal gas model is the only material model implemented in the code
To include your own custom material models, you need to implement them under `Fierro/Parallel-Solvers/User-Material-Interface` and re-build the project.
Steps:
1. Create an anaconda environment for your build
2. Install **Fierro** anaconda dependencies with `conda install elements fierro-trilinos-cpu elements -c kwelsh-lanl`
2. Install **Fierro** anaconda dependencies with `conda install elements fierro-trilinos-cpu elements -c fierromechanics`
3. [Clone the code](#cloning-the-code)
4. [Build the code](#building-the-code)

Expand Down
4 changes: 2 additions & 2 deletions single-node/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
The recommended way to use **Fierro** is through the provided Anaconda package and command line utility. To use the anaconda package, follow the steps for your platform to install [anaconda](https://docs.anaconda.com/free/anaconda/install/index.html)/[miniconda](https://docs.conda.io/en/latest/miniconda.html)/[mamba](https://mamba.readthedocs.io/en/latest/installation.html). Then run the following command in your desired Anaconda environment:

```
conda install fierro-cpu -c kwelsh-lanl -c conda-forge
conda install fierro-cpu -c fierromechanics -c conda-forge
```

This will give you access to the **Fierro** command line interface. You can run the following to check that the package was installed correctly:
Expand All @@ -30,7 +30,7 @@ The classical ideal gas model is the only material model implemented in the code
To include your own custom material models, you need to implement them under `Fierro/Parallel-Solvers/User-Material-Interface` and re-build the project.
Steps:
1. Create an anaconda environment for your build
2. Install **Fierro** anaconda dependencies with `conda install elements fierro-trilinos-cpu elements -c kwelsh-lanl`
2. Install **Fierro** anaconda dependencies with `conda install elements fierro-trilinos-cpu elements -c fierromechanics`
3. [Clone the code](#cloning-the-code)
4. [Build the code](#building-the-code)

Expand Down

0 comments on commit 75f1b0f

Please sign in to comment.