Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to scorpio 1.3.2 #359

Merged
merged 4 commits into from
Apr 19, 2022
Merged

Update to scorpio 1.3.2 #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e3ca5a
Update to compass v1.1.0-alpha.2
xylar Apr 13, 2022
0d25e2d
Update to Scorpio 1.3.2
xylar Apr 13, 2022
77416fb
Update scorpio conda recipe
xylar Apr 14, 2022
37ae401
Turn on timing for scorpio because of bug
xylar Apr 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compass/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.1.0-alpha.1'
__version__ = '1.1.0-alpha.2'
2 changes: 1 addition & 1 deletion conda/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ def build_spack_env(config, update_spack, machine, compiler, mpi, env_name,
if esmf != 'None':
specs.append(f'esmf@{esmf}+mpi+netcdf~pio+pnetcdf')
if scorpio != 'None':
specs.append(f'scorpio@{scorpio}+pnetcdf~timing+internal-timing~tools+malloc')
specs.append(f'scorpio@{scorpio}+pnetcdf+timing+internal-timing~tools+malloc')
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm turning on timing for now. In future scorpio versions, we can decide if we want it turned off but it's required in this one because of a known bug (E3SM-Project/scorpio#476)


if albany != 'None':
specs.append(f'albany@{albany}+mpas')
Expand Down
2 changes: 1 addition & 1 deletion conda/compass_env/spec-file.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ cxx-compiler
fortran-compiler
libnetcdf=4.8.1={{ mpi_prefix }}_*
libpnetcdf=1.12.2={{ mpi_prefix }}_*
scorpio=1.2.2={{ mpi_prefix }}_*
scorpio=1.3.2={{ mpi_prefix }}_*
m4
make
{{ mpi }}
Expand Down
2 changes: 1 addition & 1 deletion conda/default.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ hdf5 = 1.12.1
netcdf_c = 4.8.1
netcdf_fortran = 4.5.3
pnetcdf = 1.12.2
scorpio = 1.2.2
scorpio = 1.3.2
albany = develop
4 changes: 2 additions & 2 deletions conda/recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "compass" %}
{% set version = "1.1.0alpha.1" %}
{% set version = "1.1.0alpha.2" %}
{% set build = 0 %}

{% if mpi == "nompi" %}
Expand Down Expand Up @@ -80,7 +80,7 @@ requirements:
- make
- {{ mpi }}
- netcdf-fortran
- scorpio 1.2.2 {{ mpi_prefix }}_*
- scorpio 1.3.2 {{ mpi_prefix }}_*
{% endif %}

test:
Expand Down
12 changes: 7 additions & 5 deletions conda/scorpio/recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ export PNETCDF_PATH=$(dirname $(dirname $(which pnetcdf-config)))

mkdir build
cd build
# turning TESTS off temporarily because of a bug in 1.3.2
FC=mpifort CC=mpicc CXX=mpicxx cmake \
-DCMAKE_INSTALL_PREFIX=$PREFIX \
-DPIO_USE_MALLOC=ON \
-DPIO_ENABLE_TOOLS=OFF \
-DPIO_ENABLE_TESTS=ON \
-DPIO_ENABLE_TIMING=OFF \
-DPIO_ENABLE_INTERNAL_TIMING=ON \
-DPIO_USE_MALLOC:BOOL=ON \
-DPIO_ENABLE_TOOLS:BOOL=OFF \
-DPIO_ENABLE_TESTS:BOOL=OFF \
-DPIO_ENABLE_EXAMPLES:BOOL=OFF \
-DPIO_ENABLE_TIMING:BOOL=OFF \
-DPIO_ENABLE_INTERNAL_TIMING:BOOL=ON \
-DNetCDF_C_PATH=$NETCDF_C_PATH \
-DNetCDF_Fortran_PATH=$NETCDF_FORTRAN_PATH \
-DPnetCDF_PATH=$PNETCDF_PATH ..
Expand Down
6 changes: 3 additions & 3 deletions conda/scorpio/recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set version = "1.2.2" %}
{% set build = 2 %}
{% set version = "1.3.2" %}
{% set build = 0 %}

# recipe-lint fails if mpi is undefined
{% set mpi = mpi or 'mpich' %}
Expand All @@ -14,7 +14,7 @@ package:

source:
url: https://github.com/E3SM-Project/scorpio/archive/refs/tags/scorpio-v{{ version }}.tar.gz
sha256: f944a8b8527b188cf474d9cd26c0aaae5d8a263c245eb67cad92d8dd02ca7bfb
sha256: 663805fa24e85c88509ecd7893264e3d7d2ff27efb304e0f75dd1f0c450b08a6

build:
number: {{ build }}
Expand Down