Skip to content

Commit

Permalink
Merge pull request #111 from xylar/update-to-1.9.1
Browse files Browse the repository at this point in the history
Update to v1.9.1
  • Loading branch information
xylar authored Dec 11, 2023
2 parents c2b7680 + 99df025 commit bd82c9a
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 21 deletions.
3 changes: 1 addition & 2 deletions e3sm_supported_machines/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,7 @@ def build_env(is_test, recreate, compiler, mpi, conda_mpi, version,
channels = f'{channels} -c conda-forge/label/{package}_dev'

# edit if not using a release candidate for a given package
dev_labels = ['e3sm_to_cmip', 'e3sm_diags',
'mache', 'mpas_analysis', 'zppy', 'zstash']
dev_labels = ['zppy', 'zstash']
for package in dev_labels:
channels = f'{channels} -c conda-forge/label/{package}_dev'
channels = f'{channels} ' \
Expand Down
4 changes: 2 additions & 2 deletions e3sm_supported_machines/default.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ esmpy = 8.4.2

esmf = [email protected]+mpi+netcdf~pnetcdf~external-parallelio
hdf5 = [email protected]+cxx+fortran+hl+mpi+shared
moab = [email protected].0+mpi+hdf5+netcdf+pnetcdf+metis+parmetis+tempest
nco = [email protected].7+openmp
moab = [email protected].1+mpi+hdf5+netcdf+pnetcdf+metis+parmetis+tempest
nco = [email protected].9+openmp
netcdf_c = [email protected]+mpi~parallel-netcdf
netcdf_fortran = [email protected]
parallel_netcdf = [email protected]
Expand Down
2 changes: 1 addition & 1 deletion e3sm_supported_machines/shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
def parse_args(bootstrap):
parser = argparse.ArgumentParser(
description='Deploy E3SM-Unified')
parser.add_argument("--version", dest="version", default="1.9.0",
parser.add_argument("--version", dest="version", default="1.9.1",
help="The version of E3SM-Unified to deploy")
parser.add_argument("--conda", dest="conda_base",
help="Path for the conda base")
Expand Down
12 changes: 4 additions & 8 deletions recipes/e3sm-unified/build_and_upload.bash
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,14 @@ dev=False

if [ $dev == "True" ]
then
channels="-c conda-forge/label/e3sm_diags_dev \
-c conda-forge/label/e3sm_to_cmip_dev \
-c conda-forge/label/mache_dev \
-c conda-forge/label/mpas_analysis_dev \
channels="-c conda-forge/label/zstash_dev \
-c conda-forge/label/zppy_dev \
-c conda-forge \
-c defaults"
-c conda-forge"
else
channels="-c conda-forge -c defaults"
channels="-c conda-forge"
fi

#for file in configs/mpi_hpc_python3.10.yaml configs/mpi_mpich_python3.10.yaml
# for file in configs/mpi_mpich_python3.10.yaml configs/mpi_hpc_python3.10.yaml
for file in configs/mpi_*_python*.yaml
do
conda mambabuild -m $file --override-channels --use-local $channels .
Expand Down
16 changes: 8 additions & 8 deletions recipes/e3sm-unified/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "E3SM-Unified" %}
{% set version = "1.9.0" %}
{% set version = "1.9.1" %}
{% set build = 0 %}

package:
Expand Down Expand Up @@ -41,16 +41,16 @@ requirements:
- jupyter
- livvkit 3.0.1
- mache 1.17.0
- moab 5.5.0 {{ mpi_prefix }}_tempest_* # [mpi != 'hpc']
- moab 5.5.1 {{ mpi_prefix }}_tempest_* # [mpi != 'hpc']
- mpas-analysis 1.9.0
- mpas_tools 0.23.0
- nco 5.1.7 # [mpi != 'hpc']
- mpas_tools 0.27.0
- nco 5.1.9 # [mpi != 'hpc']
- pcmdi_metrics 2.3.1
- tempest-remap 2.2.0 # [mpi != 'hpc']
- tempest-extremes 2.2.1 {{ mpi_prefix }}_* # [mpi != 'hpc']
- xcdat 0.5.0
- zppy 2.3.0
- zstash 1.4.0 # [linux]
- zppy 2.3.1
- zstash 1.4.1 # [linux]
### dependencies ###
- {{ mpi }} # [mpi != 'nompi' and mpi != 'hpc']
- blas
Expand All @@ -71,11 +71,11 @@ requirements:
- genutil 8.2.1
- globus-sdk
- gsw
- hdf5 1.14.1 {{ mpi_prefix }}_*
- hdf5 1.14.2 {{ mpi_prefix }}_*
- ipygany
- libnetcdf 4.9.2 {{ mpi_prefix }}_*
- lxml
- matplotlib
- matplotlib 3.7.1
- metpy
- mpi4py # [mpi != 'nompi' and mpi != 'hpc']
- nb_conda
Expand Down

0 comments on commit bd82c9a

Please sign in to comment.