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

New thermodynamics #180

Merged
merged 15 commits into from
Dec 7, 2024
Merged

New thermodynamics #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2f6207c
Revise thermodynamcis - straka (#171)
chengcli Jul 25, 2024
e5701cb
Revise thermodynamcis - robert (#172)
chengcli Jul 25, 2024
075df46
Revise thermodynamcis - bryan (#173)
chengcli Aug 5, 2024
9bb7aae
Revise thermodynamcis - jcrm (#174)
chengcli Aug 6, 2024
4c7aeaf
Move precip into hydro (#178)
chengcli Oct 11, 2024
a3b3af4
Add kessler microphysics (#179)
chengcli Oct 13, 2024
635a1df
Add Jupiter CRM case (#183)
chengcli Nov 20, 2024
0bee15c
revise ci
chengcli Dec 7, 2024
95da2f0
fix ci
chengcli Dec 7, 2024
d455056
fix ci
chengcli Dec 7, 2024
445c164
fix yaml
chengcli Dec 7, 2024
b424b7f
remove shallow tests
chengcli Dec 7, 2024
1654160
fix
chengcli Dec 7, 2024
0959fcb
fix ci
chengcli Dec 7, 2024
a08b33b
remove python
chengcli Dec 7, 2024
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
208 changes: 1 addition & 207 deletions .github/workflows/mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ jobs:

bryan-2d:
if: github.event.pull_request.draft == false
runs-on: [self-hosted, macOS, ARM64]
runs-on: [self-hosted, macOS]
needs: [straka-2d]
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -219,209 +219,3 @@ jobs:
with:
name: bryan_output.nc
path: ${{github.workspace}}/examples/2019-Li-snap/bryan_output.nc

shallow-xy:
if: github.event.pull_request.draft == false
runs-on: [self-hosted, macOS, ARM64]
steps:
- uses: actions/checkout@v3
with:
lfs: false

- name: set up python libraries
run: pip3 install -r requirements.txt

- name: check if artifact exists
run: echo "ARTIFACT_EXISTS=$(./tools/check_artifact.sh swxy_output.nc)" >> $GITHUB_ENV

- uses: actions/[email protected]
if: env.ARTIFACT_EXISTS == 'true'
with:
name: swxy_output.nc
path: ${{github.workspace}}/examples/2020-polar-vortex/

- name: fetch the needed lfs file
if: env.ARTIFACT_EXISTS == 'false'
run: git lfs pull -I examples/2020-Li-polar-vortex/swxy_output.nc

- name: set up libraries
run: brew bundle

- name: set up python libraries
run: pip3 install -r requirements.txt

- name: create build directory
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DNETCDF=ON -DTASK=vortex

- name: Build
# Build your program with the given configuration
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -- -j3

- name: run simulation
working-directory: ${{github.workspace}}/build/bin
run: mpiexec -n 4 ./shallow_xy.release -i shallow_water.inp

- name: combile outputs
working-directory: ${{github.workspace}}/build/bin
run: ./combine.py -o test

- name: compare result
run: >
python3 ${{github.workspace}}/examples/2020-Li-polar-vortex/test_shallow_xy.py
${{github.workspace}}/build/bin/sw-test-main.nc
${{github.workspace}}/examples/2020-Li-polar-vortex/swxy_output.nc

- uses: actions/upload-artifact@v3
if: env.ARTIFACT_EXISTS == 'false'
with:
name: swxy_output.nc
path: ${{github.workspace}}/examples/2020-Li-polar-vortex/swxy_output.nc

polar-vortex:
if: github.event.pull_request.draft == false
runs-on: [self-hosted, macOS, ARM64]
steps:
- uses: actions/checkout@v3
with:
lfs: false

- name: check if artifact exists
run: echo "ARTIFACT_EXISTS=$(./tools/check_artifact.sh intruder_output.nc)" >> $GITHUB_ENV

- uses: actions/[email protected]
if: env.ARTIFACT_EXISTS == 'true'
with:
name: intruder_output.nc
path: ${{github.workspace}}/examples/2020-Li-polar-vortex/

- name: fetch the needed lfs file
if: env.ARTIFACT_EXISTS == 'false'
run: git lfs pull -I examples/2020-Li-polar-vortex/intruder_output.nc

- name: set up libraries
run: brew bundle

- name: set up python libraries
run: pip3 install -r requirements.txt

- name: create build directory
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_Fortran_COMPILER=gfortran-14 -DTASK=vortex

- name: Build
# Build your program with the given configuration
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -- -j3

- name: run simulation
working-directory: ${{github.workspace}}/build/bin
run: mpiexec -n 3 ./polar_vortex.release -i fig_g_intruder.inp

- name: combile outputs
working-directory: ${{github.workspace}}/build/bin
run: ./combine.py -o test

- name: compare result
run: >
python3 ${{github.workspace}}/examples/2020-Li-polar-vortex/test_polar_vortex.py
${{github.workspace}}/build/bin/intruder-test-main.nc
${{github.workspace}}/examples/2020-Li-polar-vortex/intruder_output.nc

- uses: actions/upload-artifact@v3
if: env.ARTIFACT_EXISTS == 'false'
with:
name: intruder_output.nc
path: ${{github.workspace}}/examples/2020-Li-polar-vortex/intruder_output.nc

juno-mwr:
if: github.event.pull_request.draft == false
runs-on: [self-hosted, macOS, ARM64]
steps:
- uses: actions/checkout@v3
with:
lfs: false

- name: set up libraries
run: brew bundle

- name: install python modules
run: pip3 install -r requirements.txt

- name: create build directory
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DTASK=juno

- name: build
# Build your program with the given configuration
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -- -j2

- name: run simulation
working-directory: ${{github.workspace}}/build/bin
run: ./juno_mwr.release -i juno_mwr.inp

- name: combile outputs
working-directory: ${{github.workspace}}/build/bin
run: ./combine.py -o test

- name: Test
working-directory: ${{github.workspace}}/examples/2024-JHu-juno-mwr
run: echo "cheers"

cubed-blast:
if: github.event.pull_request.draft == false
runs-on: [self-hosted, macOS, ARM64]
steps:
- uses: actions/checkout@v3
with:
lfs: false

- name: install python modules
run: pip3 install -r requirements.txt

- name: check if artifact exists
run: echo "ARTIFACT_EXISTS=$(./tools/check_artifact.sh test_blast_output.nc)" >> $GITHUB_ENV

- uses: actions/[email protected]
if: env.ARTIFACT_EXISTS == 'true'
with:
name: test_blast_output.nc
path: ${{github.workspace}}/examples/2023-Chen-exo3/

- name: fetch the needed lfs file
if: env.ARTIFACT_EXISTS == 'false'
run: git lfs pull -I examples/2023-Chen-exo3/test_blast_output.nc

- name: set up libraries
run: brew bundle

- name: create build directory
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DNETCDF=ON -DTASK=exo2

- name: Build
# Build your program with the given configuration
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -- -j4

- name: run simulation
working-directory: ${{github.workspace}}/build/bin
run: mpiexec -n 6 ./test_blast.release -i test_blast.inp

- name: combile outputs
working-directory: ${{github.workspace}}/build/bin
run: python3 combine.py -o test

- name: compare result
run: >
python3 ${{github.workspace}}/examples/2023-Chen-exo3/test_blast.py
${{github.workspace}}/build/bin/blast_48_cubed-test-main.nc
${{github.workspace}}/examples/2023-Chen-exo3/test_blast_output.nc

- uses: actions/upload-artifact@v3
if: env.ARTIFACT_EXISTS == 'false'
with:
name: swxy_output.nc
path: ${{github.workspace}}/examples/2020-Li-polar-vortex/test_blast_output.nc
Loading
Loading