Skip to content

Commit bddefc7

Browse files
committed
Merge branch 'tests/flash5'
2 parents be933f8 + 2802b45 commit bddefc7

File tree

3 files changed

+27
-2
lines changed

3 files changed

+27
-2
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ before_install:
7474
- export PATH="${PATH}:$(pwd)/../open-fortran-compiler"
7575
# FFB-MINI app
7676
- git clone "https://github.com/mbdevpl/ffb-mini" "../ffb-mini"
77+
# FLASH 5 app
78+
- git clone "https://github.com/ECP-Astro/FLASH5.git" "../flash5"
7779
# miranda_io app
7880
- git clone "https://github.com/mbdevpl/miranda_io" "../miranda_io"
7981

appveyor.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ init:
7575
#- set PATH=%PATH%;%cd%\\..\\open-fortran-compiler
7676
# FFB-MINI app
7777
- git clone "https://github.com/mbdevpl/ffb-mini" "..\\ffb-mini" --branch ofp_tests
78+
# FLASH 5 app
79+
- git clone "https://github.com/ECP-Astro/FLASH5.git" "..\\flash5"
7880
# miranda_io app
7981
- git clone "https://github.com/mbdevpl/miranda_io" "..\\miranda_io"
8082
# ant

test/test_apps.py

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,16 @@
1212

1313
_HERE = pathlib.Path(__file__).resolve().parent
1414

15+
_ROOT = _HERE.parent
16+
17+
_APPS_ROOT = pathlib.Path(os.environ.get('TEST_APPS_ROOT', _ROOT.parent)).resolve()
18+
1519
_APPS_ROOT_PATHS = {
1620
'miranda_io': pathlib.Path('..', 'miranda_io'),
1721
'FLASH-4.5': pathlib.Path('..', 'flash-4.5'),
1822
'FLASH-SUBSET': pathlib.Path('..', 'flash-subset', 'FLASH4.4'),
19-
'FFB-MINI': pathlib.Path('..', 'ffb-mini')}
23+
'FFB-MINI': pathlib.Path('..', 'ffb-mini'),
24+
'flash5': _APPS_ROOT.joinpath('flash5')}
2025

2126
_APPS_OPTIONAL = {'FLASH-4.5', 'FLASH-SUBSET'}
2227

@@ -53,7 +58,20 @@
5358
] + _FLASH_COMMON_PATHS] if 'FLASH-SUBSET' in _APPS_ROOT_PATHS else [],
5459
'FFB-MINI': [path for path in all_fortran_paths(_APPS_ROOT_PATHS['FFB-MINI'].joinpath('src'))
5560
if path.name not in ('gfc.h', 'gfrd_c.h', 'gfutil_c.h', 'gfutil_f.h', 'gfwrt_c.h',
56-
'maprof.h', 'maprof_proc.h', 'maprof_yaml.h')]}
61+
'maprof.h', 'maprof_proc.h', 'maprof_yaml.h')],
62+
'flash5': [_APPS_ROOT_PATHS['flash5'].joinpath('source', _) for _ in {
63+
pathlib.Path('physics', 'Hydro', 'HydroMain', 'unsplit', 'hy_getFaceFlux.F90'),
64+
pathlib.Path('physics', 'Hydro', 'HydroMain', 'unsplit', 'hy_getRiemannState.F90'),
65+
pathlib.Path('physics', 'Hydro', 'HydroMain', 'unsplit', 'hy_TVDslope.F90'),
66+
pathlib.Path('physics', 'Hydro', 'HydroMain', 'unsplit', 'hy_upwindTransverseFlux.F90'),
67+
pathlib.Path('physics', 'Hydro', 'HydroMain', 'unsplit', 'MHD', 'hy_eigenVector.F90'),
68+
pathlib.Path('physics', 'Eos', 'EosMain', 'Helmholtz_starkiller', 'SpeciesBased',
69+
'actual_eos.F90'),
70+
pathlib.Path('physics', 'sourceTerms', 'Burn', 'BurnMain', 'nuclearBurn', 'Aprox13',
71+
'bn_mapNetworkToSpecies.F90'),
72+
pathlib.Path('physics', 'sourceTerms', 'Burn', 'BurnMain', 'nuclearBurn', 'bn_burner.F90'),
73+
pathlib.Path('physics', 'sourceTerms', 'Burn', 'BurnMain', 'nuclearBurn', 'Burn.F90'),
74+
pathlib.Path('Simulation', 'Simulation_init.F90')}]}
5775

5876

5977
class Tests(TestsBase):
@@ -97,3 +115,6 @@ def test_ffb_mini(self):
97115
@unittest.skipIf(platform.system() == 'Windows', 'OFC not available on Windows')
98116
def test_ffb_mini_with_ofc(self):
99117
self._run_app_test('FFB-MINI', None, 35, True)
118+
119+
def test_flash5(self):
120+
self._run_app_test('flash5', None, 9)

0 commit comments

Comments
 (0)