diff --git a/reg_tests/CTestList.cmake b/reg_tests/CTestList.cmake index 2af9b9ee12..0bea1964e7 100644 --- a/reg_tests/CTestList.cmake +++ b/reg_tests/CTestList.cmake @@ -358,6 +358,10 @@ hd_regression("hd_5MW_OC3Spar_DLL_WTurb_WavesIrr" "hydrodyn;offshore") hd_regression("hd_5MW_OC4Semi_WSt_WavesWN" "hydrodyn;offshore") hd_regression("hd_5MW_TLP_DLL_WTurb_WavesIrr_WavesMulti" "hydrodyn;offshore") hd_regression("hd_TaperCylinderPitchMoment" "hydrodyn;offshore") +hd_regression("hd_NBodyMod1" "hydrodyn;offshore") +hd_regression("hd_NBodyMod2" "hydrodyn;offshore") +hd_regression("hd_NBodyMod3" "hydrodyn;offshore") + # Py-HydroDyn regression tests py_hd_regression("py_hd_5MW_OC4Semi_WSt_WavesWN" "hydrodyn;offshore;python") diff --git a/reg_tests/executeHydrodynRegressionCase.py b/reg_tests/executeHydrodynRegressionCase.py index ae67452dbc..445c21294b 100644 --- a/reg_tests/executeHydrodynRegressionCase.py +++ b/reg_tests/executeHydrodynRegressionCase.py @@ -37,7 +37,7 @@ from errorPlotting import exportCaseSummary ##### Main program -excludeExt=['.out','.outb','.ech','.yaml','.sum','.log'] +excludeExt=['.out','.outb','.ech','.yaml','.sum','.log','.rst'] ### Store the python executable for future python calls pythonCommand = sys.executable @@ -92,13 +92,7 @@ # create the local output directory if it does not already exist # and initialize it with input files for all test cases if not os.path.isdir(testBuildDirectory): - os.makedirs(testBuildDirectory) - for file in glob.glob(os.path.join(inputsDirectory,"hd_*inp")): - filename = file.split(os.path.sep)[-1] - shutil.copy(os.path.join(inputsDirectory,filename), os.path.join(testBuildDirectory,filename)) - for file in glob.glob(os.path.join(inputsDirectory,"*dat")): - filename = file.split(os.path.sep)[-1] - shutil.copy(os.path.join(inputsDirectory,filename), os.path.join(testBuildDirectory,filename)) + rtl.copyTree(inputsDirectory, testBuildDirectory, excludeExt=excludeExt) dirToCopy = os.path.join("glue-codes","openfast","5MW_Baseline","HydroData") buildDirectoryGlue = os.path.join(buildDirectory,os.pardir,os.pardir,dirToCopy) diff --git a/reg_tests/r-test b/reg_tests/r-test index fbe81eddbd..f19127ebd2 160000 --- a/reg_tests/r-test +++ b/reg_tests/r-test @@ -1 +1 @@ -Subproject commit fbe81eddbdaa51545f9a83842ebf693e7d655852 +Subproject commit f19127ebd2f82cc4f2c08ce40553d58d20050822