Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Used v3 test files and docker #752

Merged
merged 3 commits into from
Jan 30, 2025
Merged

Used v3 test files and docker #752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7543113
Made test script download v3 reg_files.
friedenhe Jan 30, 2025
1cd30bc
Disabled codecov and docker yml
friedenhe Jan 30, 2025
81f8541
Used v3.1.2 docker image for testing.
friedenhe Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 0 additions & 78 deletions .github/workflows/codecov.yml
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions .github/workflows/docker.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/reg_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ env:
REPO_NAME: 'dafoam'
DOCKER_WORKING_DIR: '/home/dafoamuser/dafoam/$REPO_NAME'
DOCKER_MOUNT_DIR: '/home/dafoamuser/mount/$REPO_NAME'
DOCKER_TAG: 'latest'
DOCKER_TAG: 'v3.1.2'
DOCKER_ENV_FILE: '/home/dafoamuser/dafoam/loadDAFoam.sh'
DOCKER_OF_ADF_BASHRC: '/home/dafoamuser/dafoam/OpenFOAM/OpenFOAM-v1812-ADF/etc/bashrc'
DOCKER_OF_ADR_BASHRC: '/home/dafoamuser/dafoam/OpenFOAM/OpenFOAM-v1812-ADR/etc/bashrc'
Expand Down
18 changes: 9 additions & 9 deletions tests/Allrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ if [ -z "$WM_PROJECT" ]; then
exit 1
fi

# check if we need to download reg_test_files-main.tar.gz
if [ -f "reg_test_files-main.tar.gz" ]; then
echo "reg_test_files-main.tar.gz already exists."
# check if we need to download reg_test_files-3.tar.gz
if [ -f "reg_test_files-3.tar.gz" ]; then
echo "reg_test_files-3.tar.gz already exists."
else
echo "Downloading reg_test_files-main.tar.gz"
wget https://github.com/DAFoam/reg_test_files/archive/refs/heads/main.tar.gz -O reg_test_files-main.tar.gz --no-check-certificate
echo "Downloading reg_test_files-3.tar.gz"
wget https://github.com/DAFoam/reg_test_files/archive/refs/tags/v3.tar.gz -O reg_test_files-3.tar.gz --no-check-certificate
fi

if [ -z "$1" ]; then
Expand All @@ -22,8 +22,8 @@ fi

function runTests()
{
rm -rf reg_test_files-main DAFoam_Test_${1}.txt
tar -zxf reg_test_files-main.tar.gz
rm -rf reg_test_files-3 DAFoam_Test_${1}.txt
tar -zxf reg_test_files-3.tar.gz
if [ -z "$DF_CHECK_COVERAGE" ]; then
mpirun --oversubscribe -np 4 python runTests_${1}.py $@ | tee DAFoam_Test_${1}.txt
if [ "${PIPESTATUS[0]}" -ne "0" ]; then
Expand Down Expand Up @@ -55,8 +55,8 @@ function runTests()

function runTestsSerial()
{
rm -rf reg_test_files-main DAFoam_Test_${1}.txt
tar -zxf reg_test_files-main.tar.gz
rm -rf reg_test_files-3 DAFoam_Test_${1}.txt
tar -zxf reg_test_files-3.tar.gz
if [ -z "$DF_CHECK_COVERAGE" ]; then
python runTests_${1}.py $@ | tee DAFoam_Test_${1}.txt
if [ "${PIPESTATUS[0]}" -ne "0" ]; then
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DAHeatTransferFoam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/ChannelConjugateHeat/thermal")
os.chdir("./reg_test_files-3/ChannelConjugateHeat/thermal")

aeroOptions = {
"designSurfaces": ["channel_outer", "channel_inner", "channel_sides"],
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DALaplacianFoam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/flange")
os.chdir("./reg_test_files-3/flange")

# test incompressible solvers
aeroOptions = {
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DAPimpleDyMFoam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import os
from testFuncs import *

os.chdir("./reg_test_files-main/NACA0012DynamicMesh")
os.chdir("./reg_test_files-3/NACA0012DynamicMesh")

replace_text_in_file("system/controlDict", "endTime 0.01;", "endTime 0.001;")

Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DAPimpleFoam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/NACA0012Unsteady")
os.chdir("./reg_test_files-3/NACA0012Unsteady")

if gcomm.rank == 0:
os.system("rm -rf processor*")
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DAPimpleFoamField.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/NACA0012Unsteady")
os.chdir("./reg_test_files-3/NACA0012Unsteady")

if gcomm.rank == 0:
os.system("rm -rf processor*")
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DAPimpleFoamTurbModels.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/NACA0012Unsteady")
os.chdir("./reg_test_files-3/NACA0012Unsteady")

funcs = {}

Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DAPisoFoam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/CurvedCubeHexMesh")
os.chdir("./reg_test_files-3/CurvedCubeHexMesh")

if gcomm.rank == 0:
os.system("rm -rf 0 processor*")
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DAPisoFoamACTL.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/CurvedCubeHexMesh")
os.chdir("./reg_test_files-3/CurvedCubeHexMesh")

if gcomm.rank == 0:
os.system("rm -rf 0 processor*")
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DARhoPimpleFoam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/NACA0012UnsteadyComp")
os.chdir("./reg_test_files-3/NACA0012UnsteadyComp")

if gcomm.rank == 0:
os.system("rm -rf processor*")
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DARhoSimpleCFoam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/NACA0012")
os.chdir("./reg_test_files-3/NACA0012")

if gcomm.rank == 0:
os.system("rm -rf 0 processor*")
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DARhoSimpleCFoamAD.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/NACA0012")
os.chdir("./reg_test_files-3/NACA0012")

if gcomm.rank == 0:
os.system("rm -rf 0 processor*")
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DARhoSimpleFoam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/CurvedCubeSnappyHexMesh")
os.chdir("./reg_test_files-3/CurvedCubeSnappyHexMesh")

if gcomm.rank == 0:
os.system("rm -rf 0 processor*")
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DARhoSimpleFoamAD.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/CurvedCubeSnappyHexMesh")
os.chdir("./reg_test_files-3/CurvedCubeSnappyHexMesh")

if gcomm.rank == 0:
os.system("rm -rf 0 processor*")
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DARhoSimpleFoamFIML.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/CurvedCubeSnappyHexMesh")
os.chdir("./reg_test_files-3/CurvedCubeSnappyHexMesh")

if gcomm.rank == 0:
os.system("rm -rf 0 processor*")
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DARhoSimpleFoamMRFAD.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/CompressorFluid")
os.chdir("./reg_test_files-3/CompressorFluid")

if gcomm.rank == 0:
os.system("rm -rf 0 processor*")
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DARhoSimpleFoamUBend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/UBendDuct")
os.chdir("./reg_test_files-3/UBendDuct")

replace_text_in_file("system/controlDict", "endTime 500;", "endTime 2000;")
replace_text_in_file("system/controlDict", "writeInterval 500;", "writeInterval 2000;")
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DAScalarTransportFoam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/pitzDailyScalarTransport")
os.chdir("./reg_test_files-3/pitzDailyScalarTransport")

TRef = 1.0

Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DASimpleFoam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/NACA0012")
os.chdir("./reg_test_files-3/NACA0012")

if gcomm.rank == 0:
os.system("rm -rf 0 processor*")
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DASimpleFoamAD.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/NACA0012")
os.chdir("./reg_test_files-3/NACA0012")

if gcomm.rank == 0:
os.system("rm -rf 0 processor*")
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DASimpleFoamField.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/NACA0012FieldInversion")
os.chdir("./reg_test_files-3/NACA0012FieldInversion")

if gcomm.rank == 0:
os.system("rm -rf 0 processor*")
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DASimpleFoamFieldForwardAD.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/NACA0012BetaSA")
os.chdir("./reg_test_files-3/NACA0012BetaSA")

replace_text_in_file("constant/turbulenceProperties", "RASModel SpalartAllmarasFv3Beta;", "RASModel SpalartAllmarasFv3FieldInversion;")

Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DASimpleFoamFieldInversionObjectiveFunctions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/NACA0012FieldInversion")
os.chdir("./reg_test_files-3/NACA0012FieldInversion")

if gcomm.rank == 0:
os.system("rm -rf 0 processor*")
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DASimpleFoamForwardAD.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/NACA0012")
os.chdir("./reg_test_files-3/NACA0012")

if gcomm.rank == 0:
os.system("rm -rf 0 processor*")
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DASimpleFoamMRF.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/CompressorFluid")
os.chdir("./reg_test_files-3/CompressorFluid")

if gcomm.rank == 0:
os.system("rm -rf 0 processor*")
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DASimpleFoamMRFForwardAD.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/CompressorFluid")
os.chdir("./reg_test_files-3/CompressorFluid")

if gcomm.rank == 0:
os.system("rm -rf 0 processor*")
Expand Down
2 changes: 1 addition & 1 deletion tests/runTests_DASimpleFoamkOmegaFieldInversionOmega.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

gcomm = MPI.COMM_WORLD

os.chdir("./reg_test_files-main/NACA0012FieldInversion")
os.chdir("./reg_test_files-3/NACA0012FieldInversion")

replace_text_in_file("constant/turbulenceProperties", "RASModel SpalartAllmarasFv3FieldInversion;", "RASModel kOmegaFieldInversionOmega;")

Expand Down
Loading