Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 8 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ workflows:
jobs:
- build-and-test


jobs:
build-and-test: # This is the name of the job, feel free to change it to better match what you're trying to do!
# These next lines defines a Docker executors: https://circleci.com/docs/2.0/executor-types/
Expand All @@ -29,21 +28,24 @@ jobs:
PYSOLID_HOME: /root/tools/PySolid
user: root
working_directory: /root/tools/PySolid
resource_class: medium

# Checkout the code as the first step. This is a dedicated CircleCI step.
steps:
- checkout
- run:
name: Setting Environment with Miniforge
command: |
apt update
apt-get update --yes && apt-get upgrade --yes
apt-get update && apt-get upgrade --yes
apt-get install --yes wget git
# download and install miniforge
# install miniforge (https://github.com/conda-forge/miniforge?tab=readme-ov-file#as-part-of-a-ci-pipeline)
mkdir -p ${HOME}/tools
cd ${HOME}/tools
wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh
bash Miniforge3-Linux-x86_64.sh -b -p ${HOME}/tools/miniforge
${HOME}/tools/miniforge/bin/mamba init bash
wget -O Miniforge3.sh "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh"
bash Miniforge3.sh -b -p ${HOME}/tools/miniforge
source "${HOME}/tools/miniforge/etc/profile.d/conda.sh"
source "${HOME}/tools/miniforge/etc/profile.d/mamba.sh"
# modify/export env var PATH to BASH_ENV to be shared across run steps
echo 'export PATH=${CONDA_PREFIX}/bin:${PATH}' >> ${BASH_ENV}

Expand Down
4 changes: 2 additions & 2 deletions src/pysolid/solid.for
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@

*** end of processing and flag for leap second

if(lflag) then
if(.false.) then
print *, 'Mild Warning -- time crossed leap second table'
print *, ' boundaries. Boundary edge value used instead'
endif
Expand Down Expand Up @@ -293,7 +293,7 @@

*** end of processing and flag of leap second

if(lflag) then
if(.false.) then
print *, 'Mild Warning -- time crossed leap second table'
print *, ' boundaries. Boundary edge value used instead'
endif
Expand Down
1 change: 1 addition & 0 deletions tests/grid.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
assert np.allclose(tide_e[::80, ::100], tide_e_80_100)
assert np.allclose(tide_n[::80, ::100], tide_n_80_100)
assert np.allclose(tide_u[::80, ::100], tide_u_80_100)
print('Pass.')

# plot
out_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), 'pic'))
Expand Down
1 change: 1 addition & 0 deletions tests/point.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
assert np.allclose(tide_e[::8000], tide_e_8000)
assert np.allclose(tide_n[::8000], tide_n_8000)
assert np.allclose(tide_u[::8000], tide_u_8000)
print('Pass.')

# plot
out_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), 'pic'))
Expand Down
Loading