From b22b7e139ea1c494fb2a0e627f32ec608ada2fe7 Mon Sep 17 00:00:00 2001 From: zmoon Date: Thu, 5 Dec 2024 09:50:04 -0600 Subject: [PATCH 1/3] Update for develop branch --- .github/workflows/docs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 6c937608..fa35bfca 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -2,9 +2,9 @@ name: Doxygen docs on: push: - branches: [feature/catchem_begins] + branches: [develop] pull_request: - branches: [feature/catchem_begins] + branches: [develop] permissions: contents: write @@ -24,7 +24,7 @@ jobs: cd - - name: Deploy - if: github.ref == 'refs/heads/feature/catchem_begins' + if: github.ref == 'refs/heads/develop' uses: JamesIves/github-pages-deploy-action@v4 with: branch: gh-pages From 9dbbdcb708e979d483e9d37af418946101bd5a9e Mon Sep 17 00:00:00 2001 From: zmoon Date: Thu, 5 Dec 2024 09:50:22 -0600 Subject: [PATCH 2/3] apt update just in case --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index fa35bfca..c517fc1e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - name: Install dependencies - run: sudo apt-get install -y doxygen graphviz + run: sudo apt-get update && sudo apt-get install -y doxygen graphviz - name: Build run: | From 75842ef1f37058d1f4fc026c91d4d58744aeb2ed Mon Sep 17 00:00:00 2001 From: zmoon Date: Thu, 5 Dec 2024 09:57:23 -0600 Subject: [PATCH 3/3] fmt --- src/core/config_mod.F90 | 2 +- src/process/drydep/ccpr_scheme_GOCART_DryDep_mod.F90 | 2 +- tests/test_drydep.f90 | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/config_mod.F90 b/src/core/config_mod.F90 index 2fb36795..d66b1968 100644 --- a/src/core/config_mod.F90 +++ b/src/core/config_mod.F90 @@ -1179,7 +1179,7 @@ SUBROUTINE Config_Process_SeaSalt( ConfigInput, Config, RC ) RC = CC_SUCCESS thisLoc = ' -> at Config_Process_SeaSalt (in CATChem/src/core/config_mod.F90)' errMsg = '' - + key = "process%seasalt%activate" v_bool = MISSING_BOOL CALL QFYAML_Add_Get( ConfigInput, TRIM( key ), v_bool, "", RC ) diff --git a/src/process/drydep/ccpr_scheme_GOCART_DryDep_mod.F90 b/src/process/drydep/ccpr_scheme_GOCART_DryDep_mod.F90 index 5ac8e779..069f399c 100644 --- a/src/process/drydep/ccpr_scheme_GOCART_DryDep_mod.F90 +++ b/src/process/drydep/ccpr_scheme_GOCART_DryDep_mod.F90 @@ -160,7 +160,7 @@ subroutine CCPr_Scheme_GOCART_DryDep(km, & if (associated(GOCART_LWI)) nullify(GOCART_LWI) if (associated(GOCART_HFLUX)) nullify(GOCART_HFLUX) if (associated(GOCART_Z0H)) nullify(GOCART_Z0H) - + ! End GOCART Code diff --git a/tests/test_drydep.f90 b/tests/test_drydep.f90 index df06721c..35bb979b 100644 --- a/tests/test_drydep.f90 +++ b/tests/test_drydep.f90 @@ -137,10 +137,10 @@ program test_drydep stop 1 end if - ! Please revisit statements below - confirm only 1 valid value is being returned + ! Please revisit statements below - confirm only 1 valid value is being returned call print_info(Config, DryDepState, MetState, title) call assert(DiagState%drydep_frequency(1) > 0.0_fp, "Test 2 GOCART drydep Scheme (resuspension activated)") - + contains