Merge pull request #171 from pdziekan/blk_trapez_fixes

blk_1m: disable n+1 forcings
igfuw · Feb 20, 2024 · b4aea9d · b4aea9d
2 parents eb5ffb3 + eb8bf70
commit b4aea9d
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 27 deletions.
diff --git a/.github/workflows/test_uwlcm.yml b/.github/workflows/test_uwlcm.yml
@@ -12,9 +12,10 @@ jobs:
 #  use the reusable workflow version from the PR code, doesn't work
 #  TODO: fix this so that changes to test_uwlcm_hlpr.yml proposed by a PR are tested...
 #    uses: ${{ github.event.pull_request.head.repo.full_name }}/UWLCM/.github/workflows/test_uwlcm_hlpr.yml@${{github.head_ref}}
+    uses: ./.github/workflows/test_uwlcm_hlpr.yml
 ####################
 #  temp: we use the workflow from the master branch of the igfuw/uwlcm repo
-    uses: igfuw/UWLCM/.github/workflows/test_uwlcm_hlpr.yml@master
+#    uses: igfuw/UWLCM/.github/workflows/test_uwlcm_hlpr.yml@master
 ####################
     with:
       UWLCM_sha: ${{ github.sha }} # merge PR SHA

diff --git a/.github/workflows/test_uwlcm_hlpr.yml b/.github/workflows/test_uwlcm_hlpr.yml
@@ -150,14 +150,15 @@ jobs:
   # therefore we build libcloudph++ in the job
   # TODO: generate refdata using RelWithDebInfoPortable ?
   moist_thermal:
-#    needs: build_libcloudphxx
+    needs: build_libcloudphxx
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         build_type: ["RelWithDebInfo"]
         mpi: ["none", "mvapich2"]
         disable_cuda: ["true"]
+        tar_name: ["RelDbgPort"]
         include:
         - mpi: "none"
           tag: "ubuntu_20_04_cuda_11_4"
@@ -175,31 +176,31 @@ jobs:
         repository: igfuw/UWLCM
         ref: ${{ inputs.UWLCM_sha }}
 
-#    - name: Download libcloudph++ dir
-#      uses: actions/download-artifact@v2
-#      with:
-#        name: libcloud_mpi_${{matrix.mpi}}_tar
-#
-#    - name: Decompress libcloudph++ dir
-#      run: tar -xvf libcloudphxx.tar
-
-    - name: checkout libcloudph++ 
-      uses: actions/checkout@v2
+    - name: Download libcloudph++ dir
+      uses: actions/download-artifact@v2
       with:
-        repository: igfuw/libcloudphxx
-        ref: ${{ inputs.libcloudphxx_sha }}
-        path: libcloudphxx
+        name: libcloud_mpi_${{matrix.mpi}}_${{matrix.tar_name}}_tar
 
-    - name: build libcloudph++
-      uses: igfuw/libcloudphxx_build@v0.2
-      with:
-        disable_cuda: ${{matrix.disable_cuda}}
-        build_type: ${{matrix.build_type}}
-        threads: ${{matrix.threads}}
-        path: ${{ github.workspace }}/libcloudphxx
-        install_prefix: ${{ github.workspace }}/installed
-        tag: ${{ matrix.tag }}
-        cxx: ${{ matrix.cxx }}
+    - name: Decompress libcloudph++ dir
+      run: tar -xvf libcloudphxx.tar
+
+#    - name: checkout libcloudph++ 
+#      uses: actions/checkout@v2
+#      with:
+#        repository: igfuw/libcloudphxx
+#        ref: ${{ inputs.libcloudphxx_sha }}
+#        path: libcloudphxx
+#
+#    - name: build libcloudph++
+#      uses: igfuw/libcloudphxx_build@v0.2
+#      with:
+#        disable_cuda: ${{matrix.disable_cuda}}
+#        build_type: ${{matrix.build_type}}
+#        threads: ${{matrix.threads}}
+#        path: ${{ github.workspace }}/libcloudphxx
+#        install_prefix: ${{ github.workspace }}/installed
+#        tag: ${{ matrix.tag }}
+#        cxx: ${{ matrix.cxx }}
 
     - name: Install libcloudph++
       working-directory: ${{ github.workspace }}/libcloudphxx

diff --git a/src/solvers/blk_1m/update_rhs_blk_1m_common.hpp b/src/solvers/blk_1m/update_rhs_blk_1m_common.hpp
@@ -82,6 +82,7 @@ void slvr_blk_1m_common<ct_params_t>::update_rhs(
     case (1):
     // trapezoidal rhs^n+1
     {
+    /*
       // ---- cloud water sources ----
       rc_src();
       rhs.at(ix::rc)(this->ijk) += this->alpha(this->ijk) + this->beta(this->ijk) * this->state(ix::rc)(this->ijk) / (1. - 0.5 * this->dt * this->beta(this->ijk));
@@ -90,7 +91,7 @@ void slvr_blk_1m_common<ct_params_t>::update_rhs(
       rr_src();
       rhs.at(ix::rr)(this->ijk) += this->alpha(this->ijk) + this->beta(this->ijk) * this->state(ix::rr)(this->ijk) / (1. - 0.5 * this->dt * this->beta(this->ijk));
 
-
+*/
       break;
     }
   }

diff --git a/tests/moist_thermal/refdata/stats_lgrngn_ens_1000.txt b/tests/moist_thermal/refdata/stats_lgrngn_ens_1000.txt
@@ -57,7 +57,7 @@ lgrngn
 (0,10)
 [ 0.000148427 0.504256 0.438996 0.393824 0.350153 0.282783 0.226725 0.18533 0.213148 0.239273 0.278241 ]
 (0,10)
-[ 0.000148427 0.518692 0.465088 0.420767 0.380097 0.323393 0.292459 0.299863 0.346371 0.457317 0.678049 ]
+[ 0.000149421 0.518692 0.465088 0.420767 0.380097 0.323393 0.292459 0.299863 0.346371 0.457317 0.678049 ]
 sdconc_avg
 lgrngn
 (0,10)