From 73c6d62aa204b14330fcfaf823ee2396d2a4b6e3 Mon Sep 17 00:00:00 2001 From: Zhang Yunjun Date: Fri, 5 Jul 2024 15:12:24 +0800 Subject: [PATCH 1/3] unit test: print out "pass" msg --- tests/grid.py | 1 + tests/point.py | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/grid.py b/tests/grid.py index 35e92c9..8b5b7ab 100755 --- a/tests/grid.py +++ b/tests/grid.py @@ -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')) diff --git a/tests/point.py b/tests/point.py index d17686d..904bb3b 100755 --- a/tests/point.py +++ b/tests/point.py @@ -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')) From 15d46f6672d7984ae360e7426e2f70f034ea556d Mon Sep 17 00:00:00 2001 From: Zhang Yunjun Date: Tue, 3 Jun 2025 11:22:54 +0800 Subject: [PATCH 2/3] `circleci`: update `miniforge` setup + `.circleci/config.yml`: replace `mamba init bash` with `source conda/mamba.sh`, as suggested by its GitHub repo readme at https://github.com/conda-forge/miniforge?tab=readme-ov-file#as-part-of-a-ci-pipeline, to fix the current circle CI environment setup error. --- .circleci/config.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e8ae932..1eb2f2b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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/ @@ -29,6 +28,8 @@ 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 @@ -36,14 +37,15 @@ jobs: 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} From 3ebf73e0f8c0281e32b9a4e7dfb2ec48d3d3bd52 Mon Sep 17 00:00:00 2001 From: Zhang Yunjun Date: Wed, 21 Jan 2026 12:04:14 +0800 Subject: [PATCH 3/3] solid.for: turn OFF the mild warning msg of time cross leap second table because 1) no leap second has been introduced since Jan 2017 (https://data.iana.org/time-zones/tzdb/leap-seconds.list), and 2) the error introduced for missing a few leap second is small, and the accuracy would still be enough for many applications (https://geodesyworld.github.io/SOFTS/solid.htm) If there is new leap second announced by IERS, we will update the code accordingly. --- src/pysolid/solid.for | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pysolid/solid.for b/src/pysolid/solid.for index b440e1b..b53b974 100644 --- a/src/pysolid/solid.for +++ b/src/pysolid/solid.for @@ -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 @@ -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