More fixes (#174)

* Updated compile flag for test. * Updated setup files for pyDASolvers to remove warnings. * Fixed more warnings. * Changed docker test to u1804. * Changed the test version to 1804
mdolab · Sep 20, 2021 · 3e706b4 · 3e706b4
1 parent 8b34967
commit 3e706b4
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 7 deletions.
diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml
@@ -13,7 +13,7 @@ env:
 
 jobs:
   code_coverage:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
     name: Codecov
     strategy:
       fail-fast: false
@@ -33,19 +33,19 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
       with:
-        python-version: 3.7
+        python-version: 3.6
     - name: Create the docker container and run the tests
       run: |
         docker pull dafoam/opt-packages:${{env.DOCKER_TAG}}
         docker run -i -d -u dafoamuser --name regtest -v $GITHUB_WORKSPACE:${{env.DOCKER_MOUNT_DIR}} dafoam/opt-packages:${{env.DOCKER_TAG}} /bin/bash
         docker exec -i regtest /bin/bash -c "rm -rf ${{env.DOCKER_WORKING_DIR}} && cp -r ${{env.DOCKER_MOUNT_DIR}} ${{env.DOCKER_WORKING_DIR}}"
         docker exec -i regtest /bin/bash -c ". ${{env.DOCKER_ENV_FILE}} && pip install coverage"
         docker exec regtest sed -i 's/-std=c++11/-std=c++11 -coverage/g' ${{env.DOCKER_WORKING_DIR}}/src/adjoint/Make/options_Incompressible
-        docker exec regtest sed -i 's/-lOpenFOAM$(DF_LIB_SUFFIX)/-lOpenFOAM$(DF_LIB_SUFFIX) -lgcov/g' ${{env.DOCKER_WORKING_DIR}}/src/adjoint/Make/options_Incompressible
+        docker exec regtest sed -i 's/-lfiniteVolume$(DF_LIB_SUFFIX)/-lfiniteVolume$(DF_LIB_SUFFIX) -lgcov/g' ${{env.DOCKER_WORKING_DIR}}/src/adjoint/Make/options_Incompressible
         docker exec regtest sed -i 's/-std=c++11/-std=c++11 -coverage/g' ${{env.DOCKER_WORKING_DIR}}/src/adjoint/Make/options_Compressible
-        docker exec regtest sed -i 's/-lOpenFOAM$(DF_LIB_SUFFIX)/-lOpenFOAM$(DF_LIB_SUFFIX) -lgcov/g' ${{env.DOCKER_WORKING_DIR}}/src/adjoint/Make/options_Compressible
+        docker exec regtest sed -i 's/-lfiniteVolume$(DF_LIB_SUFFIX)/-lfiniteVolume$(DF_LIB_SUFFIX) -lgcov/g' ${{env.DOCKER_WORKING_DIR}}/src/adjoint/Make/options_Compressible
         docker exec regtest sed -i 's/-std=c++11/-std=c++11 -coverage/g' ${{env.DOCKER_WORKING_DIR}}/src/adjoint/Make/options_Solid
-        docker exec regtest sed -i 's/-lOpenFOAM$(DF_LIB_SUFFIX)/-lOpenFOAM$(DF_LIB_SUFFIX) -lgcov/g' ${{env.DOCKER_WORKING_DIR}}/src/adjoint/Make/options_Solid
+        docker exec regtest sed -i 's/-lfiniteVolume$(DF_LIB_SUFFIX)/-lfiniteVolume$(DF_LIB_SUFFIX) -lgcov/g' ${{env.DOCKER_WORKING_DIR}}/src/adjoint/Make/options_Solid
         docker exec -i regtest /bin/bash -c "cd ${{env.DOCKER_WORKING_DIR}}/src && cp -r adjoint adjointAD && cp -r pyDASolvers pyDASolversAD"
         if [ "${{matrix.args}}" = "forward" ]; then
            docker exec -i regtest /bin/bash -c ". ${{env.DOCKER_ENV_FILE}} && cd ${{env.DOCKER_WORKING_DIR}} && ./Allmake incompressible"

diff --git a/.github/workflows/reg_tests.yml b/.github/workflows/reg_tests.yml
@@ -14,7 +14,7 @@ env:
 jobs:
 
   reg_tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
     name: Tests
     strategy:
       fail-fast: false

diff --git a/src/pyDASolvers/setup_Compressible.py b/src/pyDASolvers/setup_Compressible.py
@@ -91,6 +91,7 @@
         # All other flags for OpenFOAM, users don't need to touch this
         extra_compile_args=[
             "-std=c++11",
+            "-Wno-deprecated-copy",
             "-DCompressibleFlow",
             "-m64",
             "-DOPENFOAM_PLUS=1812",

diff --git a/src/pyDASolvers/setup_Incompressible.py b/src/pyDASolvers/setup_Incompressible.py
@@ -88,6 +88,7 @@
         # All other flags for OpenFOAM, users don't need to touch this
         extra_compile_args=[
             "-std=c++11",
+            "-Wno-deprecated-copy",
             "-DIncompressibleFlow",
             "-m64",
             "-DOPENFOAM_PLUS=1812",

diff --git a/src/pyDASolvers/setup_Solid.py b/src/pyDASolvers/setup_Solid.py
@@ -80,6 +80,7 @@
         # All other flags for OpenFOAM, users don't need to touch this
         extra_compile_args=[
             "-std=c++11",
+            "-Wno-deprecated-copy",
             "-DSolidDASolver",
             "-m64",
             "-DOPENFOAM_PLUS=1812",

diff --git a/src/utilities/coloring/pyColoringCompressible/setup.py b/src/utilities/coloring/pyColoringCompressible/setup.py
@@ -93,6 +93,7 @@
         # All other flags for OpenFOAM, users don't need to touch this
         extra_compile_args=[
             "-std=c++11",
+            "-Wno-deprecated-copy",
             "-DCompressibleFlow",
             "-m64",
             "-DOPENFOAM_PLUS=1812",

diff --git a/src/utilities/coloring/pyColoringIncompressible/setup.py b/src/utilities/coloring/pyColoringIncompressible/setup.py
@@ -90,6 +90,7 @@
         # All other flags for OpenFOAM, users don't need to touch this
         extra_compile_args=[
             "-std=c++11",
+            "-Wno-deprecated-copy",
             "-DIncompressibleFlow",
             "-m64",
             "-DOPENFOAM_PLUS=1812",

diff --git a/src/utilities/coloring/pyColoringSolid/setup.py b/src/utilities/coloring/pyColoringSolid/setup.py
@@ -82,6 +82,7 @@
         # All other flags for OpenFOAM, users don't need to touch this
         extra_compile_args=[
             "-std=c++11",
+            "-Wno-deprecated-copy",
             "-DSolidDASolver",
             "-m64",
             "-DOPENFOAM_PLUS=1812",

diff --git a/src/utilities/postProcessing/calcLiftPerSCompressible/Make/options b/src/utilities/postProcessing/calcLiftPerSCompressible/Make/options
@@ -2,6 +2,7 @@ EXE_INC = \
     -std=c++11  \
     -Wno-old-style-cast \
     -Wno-conversion-null \
+    -Wno-deprecated-copy \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \

diff --git a/src/utilities/postProcessing/calcLiftPerSIncompressible/Make/options b/src/utilities/postProcessing/calcLiftPerSIncompressible/Make/options
@@ -2,6 +2,7 @@ EXE_INC = \
     -std=c++11  \
     -Wno-old-style-cast \
     -Wno-conversion-null \
+    -Wno-deprecated-copy \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels \

diff --git a/tests/.coveragerc b/tests/.coveragerc
@@ -1,3 +1,3 @@
 [coverage:run]
 parallel = true
-include = /home/dafoamuser/dafoam/packages/miniconda3/lib/python3.7/site-packages/dafoam/pyDAFoam.py, /home/dafoamuser/dafoam/packages/miniconda3/lib/python3.7/site-packages/dafoam/optFuncs.py
+include = /home/dafoamuser/dafoam/packages/miniconda3/lib/python3.6/site-packages/dafoam/pyDAFoam.py, /home/dafoamuser/dafoam/packages/miniconda3/lib/python3.6/site-packages/dafoam/optFuncs.py