From aaae90d739fb2206ab1f73d3a60b84659503718b Mon Sep 17 00:00:00 2001 From: Marlee Smith Date: Tue, 7 Nov 2023 11:12:50 -0700 Subject: [PATCH 01/17] Adding new boolean argument (use-mpif08) and additional logic for running ./quickbuild mpif08 to action.yml --- .github/actions/build_run_model/action.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/actions/build_run_model/action.yml b/.github/actions/build_run_model/action.yml index 1f6fdfdc28..8a0e207766 100644 --- a/.github/actions/build_run_model/action.yml +++ b/.github/actions/build_run_model/action.yml @@ -27,6 +27,11 @@ inputs: type: boolean required: true default: true + use-mpif08: + description: 'specify whether to run program with MPIF08 or not' + type: boolean + required: true + default: false mpi-n-tasks: description: 'specify number of mpi tasks to run with program if mpi is used' type: number @@ -45,19 +50,25 @@ runs: shell: bash # Steps to compile and build model - name: Building ${{ inputs.model }} model + if: ${{ inputs.use-mpif08 }} + run: | + cd ${{ inputs.models-directory }}/${{ inputs.model }}/work + ./quickbuild.sh mpif08 + shell: bash + if: ${{ !inputs.use-mpif08 }} run: | cd ${{ inputs.models-directory }}/${{ inputs.model }}/work ./quickbuild.sh shell: bash # Steps to run the specified run-program with mpi options - - name: Running ${{ inputs.model }} ${{ inputs.run-program }} program (use-mpi=true) - if: ${{ inputs.use-mpi }} + - name: Running ${{ inputs.model }} ${{ inputs.run-program }} program (use-mpi/mpif08=true) + if: ${{ inputs.use-mpi }} || ${{ inputs.use-mpif08 }} run: | cd ${{ inputs.models-directory }}/${{ inputs.model }}/work/ mpirun -n ${{ inputs.mpi-n-tasks }} --allow-run-as-root ./${{ inputs.run-program }} ${{ inputs.run-program-args }} shell: bash - - name: Running ${{ inputs.model }} ${{ inputs.run-program }} program (use-mpi=false) - if: ${{ !inputs.use-mpi }} + - name: Running ${{ inputs.model }} ${{ inputs.run-program }} program (use-mpi/mpif08=false) + if: ${{ !inputs.use-mpi }} && ${{ !inputs.use-mpif08 }} run: | cd ${{ inputs.models-directory }}/${{ inputs.model }}/work/ ./${{ inputs.run-program }} ${{ inputs.run-program-args }} From 376c36cc1516911b74fe680e57bff0b9270565ad Mon Sep 17 00:00:00 2001 From: Marlee Smith Date: Tue, 7 Nov 2023 11:14:13 -0700 Subject: [PATCH 02/17] Adding new job to actions on pull request (running lorenz_84 compiled with ./quckbuild mpif08) --- .github/workflows/action_on_pull_request.yml | 22 ++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/action_on_pull_request.yml b/.github/workflows/action_on_pull_request.yml index acfd1f5f8b..96cbf08e09 100644 --- a/.github/workflows/action_on_pull_request.yml +++ b/.github/workflows/action_on_pull_request.yml @@ -25,6 +25,7 @@ jobs: model: lorenz_96 run-program: ./filter use-mpi: true + use-mpif08: false mpi-n-tasks: 2 # Job 2 @@ -44,3 +45,24 @@ jobs: model: lorenz_63 run-program: ./filter use-mpi: false + use-mpif08: false + + # Job 3 + build-run-lorenz_84-mpif08: + runs-on: ubuntu-latest + container: + image: hkershaw/dart-dep:1.0 + options: '--cap-add=SYS_PTRACE' + steps: + - name: Checkout repo + uses: actions/checkout@v3 + - name: Set checked out repo as a safe git directory + run: git config --global --add safe.directory /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }} + - name: Build and run lorenz_84 with mpif08 + uses: ./.github/actions/build_run_model + with: + model: lorenz_84 + run-program: ./filter + use-mpi: false + use-mpif08: true + mpi-n-tasks: 2 From f5167e18613715bdfebf25241495971f0e813097 Mon Sep 17 00:00:00 2001 From: Marlee Smith Date: Tue, 7 Nov 2023 11:19:15 -0700 Subject: [PATCH 03/17] Random doc change to test actions --- guide/contributors-guide.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guide/contributors-guide.rst b/guide/contributors-guide.rst index 550aa03eaa..768985c414 100644 --- a/guide/contributors-guide.rst +++ b/guide/contributors-guide.rst @@ -4,6 +4,8 @@ Contributors' guide Contributing to DART -------------------- +THIS ADDITION IS JUST TO TEST GITHUB ACTIONS!!! + This section describes how you can contribute your work to DART. Because DART is an open-source project, your contributions are welcome. Many user-provided contributions have widely benefited the earth science community. From 17aca59da08e11d64c30ada6c247c687a1a2c45e Mon Sep 17 00:00:00 2001 From: Marlee Smith Date: Tue, 7 Nov 2023 15:05:24 -0700 Subject: [PATCH 04/17] again --- guide/contributors-guide.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/guide/contributors-guide.rst b/guide/contributors-guide.rst index 768985c414..8fb0524088 100644 --- a/guide/contributors-guide.rst +++ b/guide/contributors-guide.rst @@ -5,6 +5,7 @@ Contributing to DART -------------------- THIS ADDITION IS JUST TO TEST GITHUB ACTIONS!!! +pt 2 This section describes how you can contribute your work to DART. Because DART is an open-source project, your contributions are welcome. Many user-provided From 1244c79053f42c0e2d767bc23b880a2e95eba82d Mon Sep 17 00:00:00 2001 From: Marlee Smith Date: Tue, 7 Nov 2023 16:06:24 -0700 Subject: [PATCH 05/17] again --- guide/contributors-guide.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/guide/contributors-guide.rst b/guide/contributors-guide.rst index 8fb0524088..3b845746a7 100644 --- a/guide/contributors-guide.rst +++ b/guide/contributors-guide.rst @@ -6,6 +6,7 @@ Contributing to DART THIS ADDITION IS JUST TO TEST GITHUB ACTIONS!!! pt 2 +pt 3 This section describes how you can contribute your work to DART. Because DART is an open-source project, your contributions are welcome. Many user-provided From 6c044af22e797567ba0c60ea2bffc6416f816d98 Mon Sep 17 00:00:00 2001 From: Marlee Smith Date: Wed, 8 Nov 2023 11:41:33 -0700 Subject: [PATCH 06/17] testing actions again --- guide/contributors-guide.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/guide/contributors-guide.rst b/guide/contributors-guide.rst index 3b845746a7..2ffbd4d56f 100644 --- a/guide/contributors-guide.rst +++ b/guide/contributors-guide.rst @@ -7,6 +7,7 @@ Contributing to DART THIS ADDITION IS JUST TO TEST GITHUB ACTIONS!!! pt 2 pt 3 +pt 4 This section describes how you can contribute your work to DART. Because DART is an open-source project, your contributions are welcome. Many user-provided From 4ee7c377456c6a64625d07d2de3c06adb0f5de26 Mon Sep 17 00:00:00 2001 From: Marlee Smith Date: Wed, 8 Nov 2023 11:55:39 -0700 Subject: [PATCH 07/17] again --- guide/contributors-guide.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/guide/contributors-guide.rst b/guide/contributors-guide.rst index 2ffbd4d56f..c44cd4ca24 100644 --- a/guide/contributors-guide.rst +++ b/guide/contributors-guide.rst @@ -8,6 +8,7 @@ THIS ADDITION IS JUST TO TEST GITHUB ACTIONS!!! pt 2 pt 3 pt 4 +pt 5 This section describes how you can contribute your work to DART. Because DART is an open-source project, your contributions are welcome. Many user-provided From 3237c80000f0b5887e65433988f97e8b317f5b95 Mon Sep 17 00:00:00 2001 From: Marlee Smith Date: Wed, 8 Nov 2023 12:02:42 -0700 Subject: [PATCH 08/17] again --- guide/contributors-guide.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/guide/contributors-guide.rst b/guide/contributors-guide.rst index c44cd4ca24..dc12de67f5 100644 --- a/guide/contributors-guide.rst +++ b/guide/contributors-guide.rst @@ -9,6 +9,7 @@ pt 2 pt 3 pt 4 pt 5 +pt 6 This section describes how you can contribute your work to DART. Because DART is an open-source project, your contributions are welcome. Many user-provided From 236c29fb3a77d844f4b7501d6d93d2718c6344f9 Mon Sep 17 00:00:00 2001 From: Marlee Smith Date: Wed, 8 Nov 2023 12:38:32 -0700 Subject: [PATCH 09/17] again --- guide/contributors-guide.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/guide/contributors-guide.rst b/guide/contributors-guide.rst index dc12de67f5..212853f602 100644 --- a/guide/contributors-guide.rst +++ b/guide/contributors-guide.rst @@ -10,6 +10,7 @@ pt 3 pt 4 pt 5 pt 6 +pt 7 This section describes how you can contribute your work to DART. Because DART is an open-source project, your contributions are welcome. Many user-provided From 75d2c2fae0ee1bc9bf26a49f77895f9c9e4e8634 Mon Sep 17 00:00:00 2001 From: Marlee Smith Date: Wed, 8 Nov 2023 12:45:10 -0700 Subject: [PATCH 10/17] again --- guide/contributors-guide.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/guide/contributors-guide.rst b/guide/contributors-guide.rst index 212853f602..66f12d941b 100644 --- a/guide/contributors-guide.rst +++ b/guide/contributors-guide.rst @@ -11,6 +11,7 @@ pt 4 pt 5 pt 6 pt 7 +pt 8 This section describes how you can contribute your work to DART. Because DART is an open-source project, your contributions are welcome. Many user-provided From 58233c76444d32a53ea6f27580496c1dd9c09074 Mon Sep 17 00:00:00 2001 From: Marlee Smith Date: Wed, 8 Nov 2023 12:56:02 -0700 Subject: [PATCH 11/17] again --- guide/contributors-guide.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/guide/contributors-guide.rst b/guide/contributors-guide.rst index 66f12d941b..de1a2713c3 100644 --- a/guide/contributors-guide.rst +++ b/guide/contributors-guide.rst @@ -12,6 +12,7 @@ pt 5 pt 6 pt 7 pt 8 +pt 9 This section describes how you can contribute your work to DART. Because DART is an open-source project, your contributions are welcome. Many user-provided From 30ac6f8e7860fb2122b17be0e652b50238ee3075 Mon Sep 17 00:00:00 2001 From: Marlee Smith Date: Wed, 8 Nov 2023 21:40:22 -0700 Subject: [PATCH 12/17] more testing --- guide/contributors-guide.rst | 8 -------- 1 file changed, 8 deletions(-) diff --git a/guide/contributors-guide.rst b/guide/contributors-guide.rst index de1a2713c3..768985c414 100644 --- a/guide/contributors-guide.rst +++ b/guide/contributors-guide.rst @@ -5,14 +5,6 @@ Contributing to DART -------------------- THIS ADDITION IS JUST TO TEST GITHUB ACTIONS!!! -pt 2 -pt 3 -pt 4 -pt 5 -pt 6 -pt 7 -pt 8 -pt 9 This section describes how you can contribute your work to DART. Because DART is an open-source project, your contributions are welcome. Many user-provided From e023a5ded13b99c2f00aa89cc5dc15c4a26f94f4 Mon Sep 17 00:00:00 2001 From: Marlee Smith Date: Wed, 8 Nov 2023 21:46:04 -0700 Subject: [PATCH 13/17] more testing --- guide/contributors-guide.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/guide/contributors-guide.rst b/guide/contributors-guide.rst index 768985c414..9be2bb2d88 100644 --- a/guide/contributors-guide.rst +++ b/guide/contributors-guide.rst @@ -5,6 +5,7 @@ Contributing to DART -------------------- THIS ADDITION IS JUST TO TEST GITHUB ACTIONS!!! +!!! This section describes how you can contribute your work to DART. Because DART is an open-source project, your contributions are welcome. Many user-provided From 6ea09079a26596466a724f45a11b9a86ddb3b2bd Mon Sep 17 00:00:00 2001 From: Marlee Smith Date: Wed, 8 Nov 2023 21:59:41 -0700 Subject: [PATCH 14/17] more testing --- guide/contributors-guide.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guide/contributors-guide.rst b/guide/contributors-guide.rst index 9be2bb2d88..704f6a0986 100644 --- a/guide/contributors-guide.rst +++ b/guide/contributors-guide.rst @@ -5,7 +5,7 @@ Contributing to DART -------------------- THIS ADDITION IS JUST TO TEST GITHUB ACTIONS!!! -!!! +!!!!!! This section describes how you can contribute your work to DART. Because DART is an open-source project, your contributions are welcome. Many user-provided From fbac6c1ec7ac0e3b9e6303749e2f5b3dafb01611 Mon Sep 17 00:00:00 2001 From: Marlee Smith Date: Wed, 8 Nov 2023 22:11:25 -0700 Subject: [PATCH 15/17] more testing --- guide/contributors-guide.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guide/contributors-guide.rst b/guide/contributors-guide.rst index 704f6a0986..b578d94760 100644 --- a/guide/contributors-guide.rst +++ b/guide/contributors-guide.rst @@ -5,7 +5,7 @@ Contributing to DART -------------------- THIS ADDITION IS JUST TO TEST GITHUB ACTIONS!!! -!!!!!! +!!!!!!! This section describes how you can contribute your work to DART. Because DART is an open-source project, your contributions are welcome. Many user-provided From a452d33034b1f9b0e3d2c3df7cea9878f1f91d34 Mon Sep 17 00:00:00 2001 From: Marlee Smith Date: Wed, 8 Nov 2023 22:25:36 -0700 Subject: [PATCH 16/17] more testing --- guide/contributors-guide.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guide/contributors-guide.rst b/guide/contributors-guide.rst index b578d94760..4be2b2c4af 100644 --- a/guide/contributors-guide.rst +++ b/guide/contributors-guide.rst @@ -5,7 +5,7 @@ Contributing to DART -------------------- THIS ADDITION IS JUST TO TEST GITHUB ACTIONS!!! -!!!!!!! +!!!!!!!!! This section describes how you can contribute your work to DART. Because DART is an open-source project, your contributions are welcome. Many user-provided From 2528dbe34fc6b6239b984fd8fa2eb2866ef7cdcf Mon Sep 17 00:00:00 2001 From: Marlee Smith Date: Wed, 8 Nov 2023 22:34:03 -0700 Subject: [PATCH 17/17] anotha --- guide/contributors-guide.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guide/contributors-guide.rst b/guide/contributors-guide.rst index 4be2b2c4af..63baf883bb 100644 --- a/guide/contributors-guide.rst +++ b/guide/contributors-guide.rst @@ -5,7 +5,7 @@ Contributing to DART -------------------- THIS ADDITION IS JUST TO TEST GITHUB ACTIONS!!! -!!!!!!!!! +!!!!!!!!!! This section describes how you can contribute your work to DART. Because DART is an open-source project, your contributions are welcome. Many user-provided