Merge branch 'develop' into feature/catchem_begins

ufs-community · Dec 20, 2024 · b31acf1 · b31acf1
2 parents afcbfc4 + b51a4a1
commit b31acf1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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
 
@@ -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: |
@@ -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

diff --git 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
@@ -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