From 9f63f0710361c1ff147df97869001ff11717b462 Mon Sep 17 00:00:00 2001 From: Sebastien Valat Date: Mon, 23 Mar 2026 18:21:57 +0100 Subject: [PATCH 1/4] test: add the "default" keyword for testme.json and port all testme.json to it --- pytools/idfx_test.py | 2 +- pytools/idfx_test_gen.py | 18 ++- pytools/idfx_test_run.py | 17 ++- pytools/tests/test/pb1/testme.json | 12 +- pytools/tests/test/pb2/testme.json | 14 +- test/Dust/DustEnergy/testme.json | 12 +- test/Dust/DustyShock/testme.json | 12 +- test/Dust/DustyWave/testme.json | 12 +- test/HD/FargoPlanet/testme.json | 16 ++- test/HD/MachReflection/testme.json | 16 ++- test/HD/SedovBlastWave/testme.json | 30 ++-- test/HD/ShearingBox/testme.json | 28 ++-- test/HD/ViscousDisk/testme.json | 28 ++-- test/HD/ViscousFlowPastCylinder/testme.json | 42 +++--- test/HD/sod-iso/testme.json | 54 +++---- test/HD/sod/testme.json | 54 +++---- test/HD/thermalDiffusion/testme.json | 28 ++-- test/IO/dump/testme.json | 47 +++--- test/IO/pydefix/testme.json | 30 ++-- test/IO/xdmf/testme.json | 25 ++-- test/MHD/AmbipolarCshock/testme.json | 26 ++-- test/MHD/AmbipolarCshock3D/testme.json | 62 ++++---- test/MHD/AxisFluxTube/testme.json | 30 ++-- test/MHD/Coarsening/testme.json | 22 +-- test/MHD/FargoMHDSpherical/testme.json | 32 +++-- test/MHD/HallWhistler/testme.json | 23 ++- test/MHD/LinearWaveTest/testme.json | 42 +++--- test/MHD/MTI/testme.json | 28 ++-- test/MHD/OrszagTang/testme.json | 134 ++++++++---------- test/MHD/OrszagTang3D/testme.json | 59 ++++---- test/MHD/ResistiveAlfvenWave/testme.json | 14 +- test/MHD/ShearingBox/testme.json | 16 ++- test/MHD/clessTDiffusion/testme.json | 23 ++- test/MHD/sod-iso/testme.json | 28 ++-- test/MHD/sod/testme.json | 23 ++- test/MHD/sphBragTDiffusion/testme.json | 23 ++- test/MHD/sphBragViscosity/testme.json | 25 ++-- test/Planet/PlanetMigration2D/testme.json | 22 +-- test/Planet/PlanetPlanetRK42D/testme.json | 20 +-- test/Planet/PlanetSpiral2D/testme.json | 22 +-- test/Planet/PlanetTorque3D/testme.json | 18 +-- test/Planet/PlanetsIsActiveRK52D/testme.json | 20 +-- test/SelfGravity/DustyCollapse/testme.json | 22 +-- test/SelfGravity/JeansInstability/testme.json | 20 +-- test/SelfGravity/RandomSphere/testme.json | 14 +- .../RandomSphereCartesian/testme.json | 12 +- test/SelfGravity/UniformCollapse/testme.json | 25 ++-- test/utils/columnDensity/testme.json | 16 ++- test/utils/lookupTable/testme.json | 17 +-- 49 files changed, 663 insertions(+), 672 deletions(-) diff --git a/pytools/idfx_test.py b/pytools/idfx_test.py index fd28ccb61..be35e78e5 100644 --- a/pytools/idfx_test.py +++ b/pytools/idfx_test.py @@ -169,7 +169,7 @@ def addLog(self, entry): def applyConfig(self, config: dict={}): # check args for key, value in config.items(): - if key not in ['ini', 'testfile', 'testname', 'dumpname']: + if key not in ['ini', 'testfile', 'testname', 'dumpname', 'check_file_produced']: assert key in self.cmdArgs, f"The given configuration overriding try to set an invalid paramater : {key}={value}" # override options diff --git a/pytools/idfx_test_gen.py b/pytools/idfx_test_gen.py index e552c321d..e45f927d0 100644 --- a/pytools/idfx_test_gen.py +++ b/pytools/idfx_test_gen.py @@ -32,7 +32,7 @@ def __init__(self, currentTestFile: str, name: str = ""): self.currentTestName = name # generate the list of configs to run - def genTestConfigs(self, names:str, params, whenClauses = {}) -> list: + def genTestConfigs(self, names:str, params, whenClauses = {}, defaultConfig: dict = {}) -> list: ''' Generate the the list of configurations as pytest parameters. It will unpack the configuration set by looping on all combinations defined @@ -48,20 +48,24 @@ def genTestConfigs(self, names:str, params, whenClauses = {}) -> list: whenCaluses (dict|list): Provide a set of clauses to apply after unpacking the configuration so we can patch some values depending on some others. + defaultConfig (dict): + The default configuration on top of which to apply the variants. Returns: A list of pytest.param() ready to be fiven to parametrized pytest functions. ''' # get name ordering list nameList = names.split(',') + if '' in nameList: + nameList.remove('') # gen list of complete configs all_configs = [] if isinstance(params, dict): - all_configs += self._genOneConfigSeries(names, params) + all_configs += self._genOneConfigSeries(names, params, defaultConfig=defaultConfig) elif isinstance(params, list): for p in params: - all_configs += self._genOneConfigSeries(names, p) + all_configs += self._genOneConfigSeries(names, p, defaultConfig=defaultConfig) else: raise Exception("Should never be called !") @@ -155,7 +159,7 @@ def _genNextLevelCombinations(self, input: list, paramName: str, paramValues: li result.append(v) return result - def _genOneConfigSeries(self, names: str, config: dict) -> list: + def _genOneConfigSeries(self, names: str, config: dict, defaultConfig: dict={}) -> list: ''' Generate the the list of configurations as pytest parameters. It will unpack the configuration set by looping on all combinations defined @@ -167,6 +171,8 @@ def _genOneConfigSeries(self, names: str, config: dict) -> list: name of the file. config (dict): A configuration set as a dictionnary. + defaultConfig (dict): + The default configuration to overload with the variant part. Returns: A list of pytest.param() ready to be fiven to parametrized pytest functions. @@ -179,9 +185,11 @@ def _genOneConfigSeries(self, names: str, config: dict) -> list: if 'ini' in loopOrder: loopOrder.remove('ini') loopOrder.append('ini') + if '' in loopOrder: + loopOrder.remove('') # init core with everything not a list - core = {} + core = copy.deepcopy(defaultConfig) for key, value in config.items(): if isinstance(value, list) and key not in DO_NOT_LOOP_ON: assert key in nameList, f"All variable parameteres should be ordered in the names list, '{key}' is not." diff --git a/pytools/idfx_test_run.py b/pytools/idfx_test_run.py index d14de0b41..a4ad268da 100644 --- a/pytools/idfx_test_run.py +++ b/pytools/idfx_test_run.py @@ -85,20 +85,27 @@ def genTests(self) -> list: # load json & build the inner test combinations with open(testfilePath, 'r') as fp: + # load test = json.load(fp) idefixTestGenerator=IdefixDirTestGenerator(testfilePath, testfileDir) + + # extract default config & when & variants + defaultConfig = test.get('default', {}) + whenClauses = test.get('when', {}) + variants = test.get('variants', {}) + if 'namings' in test: namings = test['namings'] - autoExtracted = idefixTestGenerator.extractNamingParameters(test['variants']) + autoExtracted = idefixTestGenerator.extractNamingParameters(variants) self._validateNaming(namings, autoExtracted, testfilePath) else: - namings = idefixTestGenerator.extractNamingParameters(test['variants']) + namings = idefixTestGenerator.extractNamingParameters(variants) # required to simplify the algos later, if var is listed as variable, we need to loop over it. - self._makeVariableArgAsList(namings, test['variants']) + self._makeVariableArgAsList(namings, variants) # gen - result += idefixTestGenerator.genTestConfigs(namings, test['variants'], test.get('when', {})) + result += idefixTestGenerator.genTestConfigs(namings, variants, whenClauses=whenClauses, defaultConfig=defaultConfig) except Exception as e: raise Exception(f"Fail to generate tests from {testfileRelPath} : {e}") @@ -151,7 +158,7 @@ def run(self, config: dict) -> None: # check produced for file in check_file_produced: - if not os.path.exists(file): + if not os.path.exists(file) and not self.currentTestRunner.fake: raise Exception(f"Don't find expected file to be produced by the run : {file} !") def _runNonRegression(self, dumpname, ini, config_override, tolerance=0, definitionFile="", nonReg=True, nonRegIni=None, standardTest=True, first_run_ini=None,first_run_dumpname=None,configure_and_compile=True): diff --git a/pytools/tests/test/pb1/testme.json b/pytools/tests/test/pb1/testme.json index d8ddad44f..25e225f93 100644 --- a/pytools/tests/test/pb1/testme.json +++ b/pytools/tests/test/pb1/testme.json @@ -1,11 +1,13 @@ { + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "reconstruction": 2, + "tolerance": 1e-14 + }, "variants": [ { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-implicit.ini"], - "noplot": true, - "reconstruction": 2, - "tolerance": 1e-14 + "ini": ["idefix.ini","idefix-implicit.ini"] } ] } diff --git a/pytools/tests/test/pb2/testme.json b/pytools/tests/test/pb2/testme.json index 96c1753ab..6401a69cd 100644 --- a/pytools/tests/test/pb2/testme.json +++ b/pytools/tests/test/pb2/testme.json @@ -1,18 +1,18 @@ { + "default": { + "dumpname": "dump.0001.dmp", + "reconstruction": 2, + "tolerance": 1e-14 + }, "variants": [ { - "dumpname": "dump.0001.dmp", "ini": ["idefix.ini","idefix-implicit.ini"], - "noplot": true, - "reconstruction": 2, - "tolerance": 1e-14 + "noplot": true }, { "dumpname": "dump.0001.dmp", "ini": ["idefix.ini","idefix-implicit.ini"], - "noplot": false, - "reconstruction": 2, - "tolerance": 1e-14 + "noplot": false } ] } diff --git a/test/Dust/DustEnergy/testme.json b/test/Dust/DustEnergy/testme.json index 9a78834b9..3465b5fdb 100644 --- a/test/Dust/DustEnergy/testme.json +++ b/test/Dust/DustEnergy/testme.json @@ -1,12 +1,14 @@ { "namings": "ini", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "reconstruction": 2, + "tolerance": 0 + }, "variants": [ { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-implicit.ini"], - "noplot": true, - "reconstruction": 2, - "tolerance": 0 + "ini": ["idefix.ini","idefix-implicit.ini"] } ] } diff --git a/test/Dust/DustyShock/testme.json b/test/Dust/DustyShock/testme.json index d8ddad44f..25e225f93 100644 --- a/test/Dust/DustyShock/testme.json +++ b/test/Dust/DustyShock/testme.json @@ -1,11 +1,13 @@ { + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "reconstruction": 2, + "tolerance": 1e-14 + }, "variants": [ { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-implicit.ini"], - "noplot": true, - "reconstruction": 2, - "tolerance": 1e-14 + "ini": ["idefix.ini","idefix-implicit.ini"] } ] } diff --git a/test/Dust/DustyWave/testme.json b/test/Dust/DustyWave/testme.json index 0050f364e..13309e266 100644 --- a/test/Dust/DustyWave/testme.json +++ b/test/Dust/DustyWave/testme.json @@ -1,12 +1,14 @@ { "namings": "ini", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "reconstruction": 2, + "tolerance": 1e-14 + }, "variants": [ { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-implicit.ini"], - "noplot": true, - "reconstruction": 2, - "tolerance": 1e-14 + "ini": ["idefix.ini","idefix-implicit.ini"] } ] } diff --git a/test/HD/FargoPlanet/testme.json b/test/HD/FargoPlanet/testme.json index e1d735828..4753035c3 100644 --- a/test/HD/FargoPlanet/testme.json +++ b/test/HD/FargoPlanet/testme.json @@ -1,15 +1,17 @@ { "namings": "ini,mpi", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "reconstruction": 2, + "single": false, + "dec": [2, 2], + "tolerance": 1e-13 + }, "variants": [ { - "dumpname": "dump.0001.dmp", "ini": ["idefix.ini", "idefix-rkl.ini"], - "noplot": true, - "reconstruction": 2, - "single": false, - "mpi": [false, true], - "dec": [2, 2], - "tolerance": 1e-13 + "mpi": [false, true] } ], "when": [ diff --git a/test/HD/MachReflection/testme.json b/test/HD/MachReflection/testme.json index be2d8d950..c701471f3 100644 --- a/test/HD/MachReflection/testme.json +++ b/test/HD/MachReflection/testme.json @@ -1,15 +1,17 @@ { "namings": "ini,mpi", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "reconstruction": 2, + "single": false, + "dec": [2, 2], + "tolerance": 0 + }, "variants": [ { - "dumpname": "dump.0001.dmp", "ini": ["idefix.ini","idefix-hll.ini","idefix-hllc.ini","idefix-tvdlf.ini"], - "noplot": true, - "reconstruction": 2, - "single": false, - "mpi": [false, true], - "dec": [2, 2], - "tolerance": 0 + "mpi": [false, true] } ] } diff --git a/test/HD/SedovBlastWave/testme.json b/test/HD/SedovBlastWave/testme.json index 11327598b..bdf6e7121 100644 --- a/test/HD/SedovBlastWave/testme.json +++ b/test/HD/SedovBlastWave/testme.json @@ -1,28 +1,22 @@ { "namings": "definitionFile,ini", + "default": { + "dumpname": "dump.0001.dmp", + "vectPot": false, + "reconstruction": 2, + "single": false, + "mpi": true, + "dec": [2, 2, 2 ], + "standardTest": false, + "tolerance": 0 + }, "variants": [ { - "dumpname": "dump.0001.dmp", "definitionFile": "definitions.hpp", - "ini": ["idefix.ini"], - "vectPot": false, - "reconstruction": 2, - "single": false, - "mpi": true, - "dec": [2, 2, 2 ], - "standardTest": false, - "tolerance": 0 + "ini": ["idefix.ini"] },{ - "dumpname": "dump.0001.dmp", "definitionFile": "definitions-spherical.hpp", - "ini": ["idefix-spherical.ini"], - "vectPot": false, - "reconstruction": 2, - "single": false, - "mpi": true, - "dec": [2, 2, 2 ], - "standardTest": false, - "tolerance": 0 + "ini": ["idefix-spherical.ini"] } ] } diff --git a/test/HD/ShearingBox/testme.json b/test/HD/ShearingBox/testme.json index 3e473d0ba..802c6ce33 100644 --- a/test/HD/ShearingBox/testme.json +++ b/test/HD/ShearingBox/testme.json @@ -1,15 +1,17 @@ { - "namings": "ini", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-fargo.ini"], - "noplot": true, - "reconstruction": 2, - "single": false, - "mpi": false, - "dec": ["2","1","2"], - "tolerance": 1e-15 - } - ] + "namings": "ini", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "reconstruction": 2, + "single": false, + "mpi": false, + "dec": ["2","1","2"], + "tolerance": 1e-15 + }, + "variants": [ + { + "ini": ["idefix.ini","idefix-fargo.ini"] + } + ] } diff --git a/test/HD/ViscousDisk/testme.json b/test/HD/ViscousDisk/testme.json index df8c19d86..a25a09e4b 100644 --- a/test/HD/ViscousDisk/testme.json +++ b/test/HD/ViscousDisk/testme.json @@ -1,15 +1,17 @@ { - "namings": "ini", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-rkl.ini"], - "noplot": true, - "reconstruction": 2, - "single": false, - "mpi": false, - "dec": ["2","1","2"], - "tolerance": 3e-15 - } - ] + "namings": "ini", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "reconstruction": 2, + "single": false, + "mpi": false, + "dec": ["2","1","2"], + "tolerance": 3e-15 + }, + "variants": [ + { + "ini": ["idefix.ini","idefix-rkl.ini"] + } + ] } diff --git a/test/HD/ViscousFlowPastCylinder/testme.json b/test/HD/ViscousFlowPastCylinder/testme.json index 7b3763436..519a01ca4 100644 --- a/test/HD/ViscousFlowPastCylinder/testme.json +++ b/test/HD/ViscousFlowPastCylinder/testme.json @@ -1,23 +1,25 @@ { - "namings": "ini,mpi", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-rkl.ini"], - "noplot": true, - "reconstruction": 2, - "single": false, - "mpi": [false, true], - "dec": ["2","2"], - "tolerance": 3e-14 - } - ], - "when": { - "conditions": { - "ini": "idefix-rkl.ini" - }, - "apply": { - "tolerance": 1e-8 - } + "namings": "ini,mpi", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "reconstruction": 2, + "single": false, + "dec": ["2","2"], + "tolerance": 3e-14 + }, + "variants": [ + { + "ini": ["idefix.ini","idefix-rkl.ini"], + "mpi": [false, true] } + ], + "when": { + "conditions": { + "ini": "idefix-rkl.ini" + }, + "apply": { + "tolerance": 1e-8 + } + } } diff --git a/test/HD/sod-iso/testme.json b/test/HD/sod-iso/testme.json index 5016415d6..480bc50d3 100644 --- a/test/HD/sod-iso/testme.json +++ b/test/HD/sod-iso/testme.json @@ -1,33 +1,25 @@ { - "namings": "ini,single,reconstruction", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-hll.ini","idefix-hllc.ini","idefix-tvdlf.ini"], - "vectPot": false, - "noplot": true, - "reconstruction": [2, 3], - "single": [false], - "mpi": false, - "tolerance": 0 - },{ - "dumpname": "dump.0001.dmp", - "ini": ["idefix-rk3.ini","idefix-hllc-rk3.ini"], - "vectPot": false, - "noplot": true, - "reconstruction": [4], - "single": [false], - "mpi": false, - "tolerance": 0 - },{ - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-hll.ini","idefix-hllc.ini","idefix-tvdlf.ini"], - "vectPot": false, - "noplot": true, - "reconstruction": [2], - "single": [true], - "mpi": false, - "tolerance": 0 - } - ] + "namings": "ini,single,reconstruction", + "default": { + "dumpname": "dump.0001.dmp", + "mpi": false, + "vectPot": false, + "noplot": true, + "tolerance": 0 + }, + "variants": [ + { + "ini": ["idefix.ini","idefix-hll.ini","idefix-hllc.ini","idefix-tvdlf.ini"], + "reconstruction": [2, 3], + "single": [false] + },{ + "ini": ["idefix-rk3.ini","idefix-hllc-rk3.ini"], + "reconstruction": [4], + "single": [false] + },{ + "ini": ["idefix.ini","idefix-hll.ini","idefix-hllc.ini","idefix-tvdlf.ini"], + "reconstruction": [2], + "single": [true] + } + ] } diff --git a/test/HD/sod/testme.json b/test/HD/sod/testme.json index 9128c08d4..d5d287c46 100644 --- a/test/HD/sod/testme.json +++ b/test/HD/sod/testme.json @@ -1,33 +1,25 @@ { - "namings": "ini,single,reconstruction", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-hll.ini","idefix-hllc.ini","idefix-tvdlf.ini"], - "noplot": true, - "vectPot": false, - "single": [false], - "reconstruction": [2,3], - "mpi": false, - "tolerance": 0 - },{ - "dumpname": "dump.0001.dmp", - "ini": ["idefix-rk3.ini","idefix-hllc-rk3.ini"], - "noplot": true, - "vectPot": false, - "single": [false], - "reconstruction": [4], - "mpi": false, - "tolerance": 0 - },{ - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-hll.ini","idefix-hllc.ini","idefix-tvdlf.ini"], - "noplot": true, - "vectPot": false, - "reconstruction": [2], - "mpi": false, - "single": [true], - "tolerance": 0 - } - ] + "namings": "ini,single,reconstruction", + "default": { + "dumpname": "dump.0001.dmp", + "mpi": false, + "noplot": true, + "vectPot": false, + "tolerance": 0 + }, + "variants": [ + { + "ini": ["idefix.ini","idefix-hll.ini","idefix-hllc.ini","idefix-tvdlf.ini"], + "single": [false], + "reconstruction": [2,3] + },{ + "ini": ["idefix-rk3.ini","idefix-hllc-rk3.ini"], + "single": [false], + "reconstruction": [4] + },{ + "ini": ["idefix.ini","idefix-hll.ini","idefix-hllc.ini","idefix-tvdlf.ini"], + "reconstruction": [2], + "single": [true] + } + ] } diff --git a/test/HD/thermalDiffusion/testme.json b/test/HD/thermalDiffusion/testme.json index 2e89ad747..8fd07a94a 100644 --- a/test/HD/thermalDiffusion/testme.json +++ b/test/HD/thermalDiffusion/testme.json @@ -1,15 +1,17 @@ { - "namings": "ini", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-rkl.ini"], - "noplot": true, - "reconstruction": 2, - "single": false, - "mpi": false, - "dec": ["2","1","2"], - "tolerance": 0 - } - ] + "namings": "ini", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "reconstruction": 2, + "single": false, + "mpi": false, + "dec": ["2","1","2"], + "tolerance": 0 + }, + "variants": [ + { + "ini": ["idefix.ini","idefix-rkl.ini"] + } + ] } diff --git a/test/IO/dump/testme.json b/test/IO/dump/testme.json index cb69f946f..39c575662 100644 --- a/test/IO/dump/testme.json +++ b/test/IO/dump/testme.json @@ -1,28 +1,23 @@ { - "namings": "ini,single,vectPot,mpi", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini"], - "vectPot": [false, true], - "reconstruction": 2, - "single": [false], - "mpi": [false, true], - "dec": ["2","2","2"], - "standardTest": false, - "nonRegressionTest": false, - "tolerance": 1e-13 - },{ - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini"], - "vectPot": [false], - "reconstruction": 2, - "mpi": [false, true], - "single": [true], - "dec": ["2","2","2"], - "standardTest": false, - "nonRegressionTest": false, - "tolerance": 1e-13 - } - ] + "default": { + "ini": "idefix.ini", + "dumpname": "dump.0001.dmp", + "tolerance": 1e-13, + "nonRegressionTest": false, + "standardTest": false, + "reconstruction": 2, + "dec": [2, 2, 2] + }, + "variants": [ + { + "single": false, + "vectPot": [false, true], + "mpi": [false, true] + }, { + + "vectPot": false, + "single": true, + "mpi": [false, true] + } + ] } diff --git a/test/IO/pydefix/testme.json b/test/IO/pydefix/testme.json index 78760f724..d228245c0 100644 --- a/test/IO/pydefix/testme.json +++ b/test/IO/pydefix/testme.json @@ -1,17 +1,17 @@ { - "namings": "ini,single,vectPot,mpi", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini"], - "noplot": true, - "vectPot": false, - "reconstruction": 2, - "single": false, - "mpi": [false, true], - "dec": ["2","2"], - "standardTest": false, - "tolerance": 1e-12 - } - ] + "default": { + "ini": "idefix.ini", + "dumpname": "dump.0001.dmp", + "tolerance": 1e-12, + "dec": [2, 2], + "noplot": true, + "vectPot": false, + "single": false, + "reconstruction": 2 + }, + "variants": [ + { + "mpi": [false, true] + } + ] } diff --git a/test/IO/xdmf/testme.json b/test/IO/xdmf/testme.json index 8198bb7bb..42628d6d6 100644 --- a/test/IO/xdmf/testme.json +++ b/test/IO/xdmf/testme.json @@ -1,17 +1,12 @@ { - "namings": "ini,single,vectPot,mpi", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini"], - "vectPot": false, - "reconstruction": 2, - "single": false, - "mpi": false, - "dec": ["2","2","2"], - "standardTest": false, - "nonRegressionTest": false, - "check_file_produced": [ "data.0001.flt.xmf", "data.0001.flt.h5" ] - } - ] + "default": { + "ini": "idefix.ini", + "dumpname": "dump.0001.dmp", + "vectPot": false, + "single": false, + "mpi": false, + "nonRegressionTest": false, + "standardTest": false, + "check_file_produced": [ "data.0001.flt.xmf", "data.0001.flt.h5" ] + } } diff --git a/test/MHD/AmbipolarCshock/testme.json b/test/MHD/AmbipolarCshock/testme.json index 2eb2ac51f..4ce0ace6d 100644 --- a/test/MHD/AmbipolarCshock/testme.json +++ b/test/MHD/AmbipolarCshock/testme.json @@ -1,14 +1,16 @@ { - "namings": "ini", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-rkl.ini"], - "noplot": true, - "single": false, - "reconstruction": 2, - "mpi": false, - "tolerance": 0 - } - ] + "namings": "ini", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "single": false, + "reconstruction": 2, + "mpi": false, + "tolerance": 0 + }, + "variants": [ + { + "ini": ["idefix.ini","idefix-rkl.ini"] + } + ] } diff --git a/test/MHD/AmbipolarCshock3D/testme.json b/test/MHD/AmbipolarCshock3D/testme.json index fdcb11a76..96c8bff2a 100644 --- a/test/MHD/AmbipolarCshock3D/testme.json +++ b/test/MHD/AmbipolarCshock3D/testme.json @@ -1,35 +1,33 @@ { - "namings": "ini,mpi,vectPot", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-rkl.ini"], - "noplot": true, - "single": false, - "reconstruction": 2, - "mpi": [false], - "vectPot": [false, true], - "dec": ["2","1","1"], - "tolerance": 3e-14 - },{ - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-rkl.ini"], - "noplot": true, - "single": false, - "reconstruction": 2, - "mpi": [true], - "vectPot": [false], - "dec": ["2","1","1"], - "tolerance": 3e-14 - } - ], - "when": { - "conditions": { - "ini": "idefix-rkl.ini", - "mpi": true - }, - "apply": { - "tolerance": 2e-10 - } + "namings": "ini,mpi,vectPot", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "single": false, + "reconstruction": 2, + "tolerance": 3e-14 + }, + "variants": [ + { + "ini": ["idefix.ini","idefix-rkl.ini"], + "mpi": [false], + "vectPot": [false, true], + "dec": ["2","1","1"] + },{ + "ini": ["idefix.ini","idefix-rkl.ini"], + "mpi": [true], + "vectPot": [false], + "dec": ["2","1","1"], + "tolerance": 3e-14 } + ], + "when": { + "conditions": { + "ini": "idefix-rkl.ini", + "mpi": true + }, + "apply": { + "tolerance": 2e-10 + } + } } diff --git a/test/MHD/AxisFluxTube/testme.json b/test/MHD/AxisFluxTube/testme.json index 781d4f7b3..f5d074770 100644 --- a/test/MHD/AxisFluxTube/testme.json +++ b/test/MHD/AxisFluxTube/testme.json @@ -1,16 +1,18 @@ { - "namings": "ini,mpi", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-coarsening.ini"], - "noplot": true, - "single": false, - "reconstruction": 2, - "mpi": [false, true], - "vectPot": false, - "standardTest": false, - "tolerance": 1e-14 - } - ] + "namings": "ini,mpi", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "single": false, + "reconstruction": 2, + "vectPot": false, + "standardTest": false, + "tolerance": 1e-14 + }, + "variants": [ + { + "ini": ["idefix.ini","idefix-coarsening.ini"], + "mpi": [false, true] + } + ] } diff --git a/test/MHD/Coarsening/testme.json b/test/MHD/Coarsening/testme.json index 5b38ffebb..b631c5ec7 100644 --- a/test/MHD/Coarsening/testme.json +++ b/test/MHD/Coarsening/testme.json @@ -1,12 +1,14 @@ { - "namings": "ini,mpi", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-rkl.ini","idefix-x2.ini","idefix-x3.ini"], - "noplot": true, - "mpi": [false,true], - "tolerance": 0 - } - ] + "namings": "ini,mpi", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "tolerance": 0 + }, + "variants": [ + { + "ini": ["idefix.ini","idefix-rkl.ini","idefix-x2.ini","idefix-x3.ini"], + "mpi": [false,true] + } + ] } diff --git a/test/MHD/FargoMHDSpherical/testme.json b/test/MHD/FargoMHDSpherical/testme.json index 72d93f493..8943f0ce5 100644 --- a/test/MHD/FargoMHDSpherical/testme.json +++ b/test/MHD/FargoMHDSpherical/testme.json @@ -1,17 +1,19 @@ { - "namings": "ini,mpi,vectPot", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini"], - "noplot": true, - "single": false, - "reconstruction": 2, - "vectPot": [false, true], - "mpi": [false, true], - "dec": ["2","2","2"], - "standardTest": false, - "tolerance": 1e-14 - } - ] + "namings": "ini,mpi,vectPot", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "single": false, + "reconstruction": 2, + "dec": ["2","2","2"], + "standardTest": false, + "tolerance": 1e-14 + }, + "variants": [ + { + "ini": ["idefix.ini"], + "vectPot": [false, true], + "mpi": [false, true] + } + ] } diff --git a/test/MHD/HallWhistler/testme.json b/test/MHD/HallWhistler/testme.json index cc71c4bf7..b08340cbe 100644 --- a/test/MHD/HallWhistler/testme.json +++ b/test/MHD/HallWhistler/testme.json @@ -1,15 +1,12 @@ { - "namings": "ini", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini"], - "noplot": true, - "vectPot": false, - "single": false, - "reconstruction": 2, - "mpi": false, - "tolerance": 1e-15 - } - ] + "default": { + "dumpname": "dump.0001.dmp", + "ini": "idefix.ini", + "noplot": true, + "vectPot": false, + "single": false, + "reconstruction": 2, + "mpi": false, + "tolerance": 1e-15 + } } diff --git a/test/MHD/LinearWaveTest/testme.json b/test/MHD/LinearWaveTest/testme.json index a3f997e34..dd56af87f 100644 --- a/test/MHD/LinearWaveTest/testme.json +++ b/test/MHD/LinearWaveTest/testme.json @@ -1,24 +1,22 @@ { - "namings": "ini,reconstruction,mpi", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix-fast.ini","idefix-slow.ini","idefix-alfven.ini","idefix-entropy.ini"], - "noplot": true, - "single": false, - "reconstruction": [2], - "mpi": [false,true], - "dec": ["2","2","2"], - "tolerance": 2e-13 - },{ - "dumpname": "dump.0001.dmp", - "ini": ["idefix-fast.ini","idefix-slow.ini","idefix-alfven.ini","idefix-entropy.ini"], - "noplot": true, - "single": false, - "reconstruction": [3, 4], - "mpi": [false], - "dec": ["2","2","2"], - "tolerance": 2e-13 - } - ] + "namings": "ini,reconstruction,mpi", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "dec": ["2","2","2"], + "tolerance": 2e-13 + }, + "variants": [ + { + "ini": ["idefix-fast.ini","idefix-slow.ini","idefix-alfven.ini","idefix-entropy.ini"], + "single": false, + "reconstruction": [2], + "mpi": [false,true] + },{ + "ini": ["idefix-fast.ini","idefix-slow.ini","idefix-alfven.ini","idefix-entropy.ini"], + "single": false, + "reconstruction": [3, 4], + "mpi": [false] + } + ] } diff --git a/test/MHD/MTI/testme.json b/test/MHD/MTI/testme.json index 3bd669cca..1adf7c6f7 100644 --- a/test/MHD/MTI/testme.json +++ b/test/MHD/MTI/testme.json @@ -1,15 +1,17 @@ { - "namings": "ini", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-rkl.ini","idefix-sl.ini"], - "noplot": true, - "vectPot": false, - "single": false, - "reconstruction": 2, - "mpi": false, - "tolerance": 0 - } - ] + "namings": "ini", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "vectPot": false, + "single": false, + "reconstruction": 2, + "mpi": false, + "tolerance": 0 + }, + "variants": [ + { + "ini": ["idefix.ini","idefix-rkl.ini","idefix-sl.ini"] + } + ] } diff --git a/test/MHD/OrszagTang/testme.json b/test/MHD/OrszagTang/testme.json index 3128b3239..b455db40d 100644 --- a/test/MHD/OrszagTang/testme.json +++ b/test/MHD/OrszagTang/testme.json @@ -1,74 +1,66 @@ { - "namings": "ini,reconstruction,mpi,single,vectPot", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": [ - "idefix.ini", - "idefix-hll.ini", - "idefix-hlld-arithmetic.ini", - "idefix-hlld-hll.ini", - "idefix-hlld-hlld.ini", - "idefix-hlld-uct0.ini", - "idefix-hlld.ini", - "idefix-tvdlf.ini" - ], - "noplot": true, - "vectPot": [false], - "single": false, - "reconstruction": [2,3,4], - "mpi": [false, true], - "dec": ["2","2"], - "tolerance": 1e-12, - "standardTest": false - },{ - "dumpname": "dump.0001.dmp", - "ini": [ - "idefix.ini", - "idefix-hll.ini", - "idefix-hlld-arithmetic.ini", - "idefix-hlld-hll.ini", - "idefix-hlld-hlld.ini", - "idefix-hlld-uct0.ini", - "idefix-hlld.ini", - "idefix-tvdlf.ini" - ], - "noplot": true, - "vectPot": [false], - "single": true, - "reconstruction": [2], - "mpi": [false], - "dec": ["2","2"], - "tolerance": 1e-12, - "standardTest": false - },{ - "dumpname": "dump.0001.dmp", - "ini": [ - "idefix.ini", - "idefix-hll.ini", - "idefix-hlld-arithmetic.ini", - "idefix-hlld-hll.ini", - "idefix-hlld-hlld.ini", - "idefix-hlld-uct0.ini", - "idefix-hlld.ini", - "idefix-tvdlf.ini" - ], - "noplot": true, - "vectPot": [true], - "single": false, - "reconstruction": [2], - "mpi": [false], - "dec": ["2","2"], - "tolerance": 1e-12, - "standardTest": false - } - ], - "when": { - "conditions": { - "single": true - }, - "apply" : { - "tolerance": 1e-5 - } + "namings": "ini,reconstruction,mpi,single,vectPot", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "dec": ["2","2"], + "tolerance": 1e-12, + "standardTest": false + }, + "variants": [ + { + "ini": [ + "idefix.ini", + "idefix-hll.ini", + "idefix-hlld-arithmetic.ini", + "idefix-hlld-hll.ini", + "idefix-hlld-hlld.ini", + "idefix-hlld-uct0.ini", + "idefix-hlld.ini", + "idefix-tvdlf.ini" + ], + "vectPot": [false], + "single": false, + "reconstruction": [2,3,4], + "mpi": [false, true] + },{ + "ini": [ + "idefix.ini", + "idefix-hll.ini", + "idefix-hlld-arithmetic.ini", + "idefix-hlld-hll.ini", + "idefix-hlld-hlld.ini", + "idefix-hlld-uct0.ini", + "idefix-hlld.ini", + "idefix-tvdlf.ini" + ], + "vectPot": [false], + "single": true, + "reconstruction": [2], + "mpi": [false] + },{ + "ini": [ + "idefix.ini", + "idefix-hll.ini", + "idefix-hlld-arithmetic.ini", + "idefix-hlld-hll.ini", + "idefix-hlld-hlld.ini", + "idefix-hlld-uct0.ini", + "idefix-hlld.ini", + "idefix-tvdlf.ini" + ], + "vectPot": [true], + "single": false, + "reconstruction": [2], + "mpi": [false] } + ], + "when": { + "conditions": { + "single": true + }, + "apply" : { + "tolerance": 1e-5 + } + } } diff --git a/test/MHD/OrszagTang3D/testme.json b/test/MHD/OrszagTang3D/testme.json index a37b54164..8bebdb77e 100644 --- a/test/MHD/OrszagTang3D/testme.json +++ b/test/MHD/OrszagTang3D/testme.json @@ -1,34 +1,31 @@ { - "namings": "ini,single,vectPot,mpi", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini"], - "vectPot": [false, true], - "reconstruction": 2, - "single": [false], - "mpi": [false, true], - "dec": ["2","2","2"], - "standardTest": false, - "tolerance": 1e-13 - },{ - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini"], - "vectPot": [false], - "reconstruction": 2, - "mpi": [false, true], - "single": [true], - "dec": ["2","2","2"], - "standardTest": false, - "tolerance": 1e-13 - } - ], - "when": { - "conditions": { - "single": true - }, - "apply" : { - "tolerance": 1e-6 - } + "namings": "ini,single,vectPot,mpi", + "default": { + "dumpname": "dump.0001.dmp", + "reconstruction": 2, + "dec": ["2","2","2"], + "standardTest": false, + "tolerance": 1e-13 + }, + "variants": [ + { + "ini": ["idefix.ini"], + "vectPot": [false, true], + "single": [false], + "mpi": [false, true] + },{ + "ini": ["idefix.ini"], + "vectPot": [false], + "mpi": [false, true], + "single": [true] } + ], + "when": { + "conditions": { + "single": true + }, + "apply" : { + "tolerance": 1e-6 + } + } } diff --git a/test/MHD/ResistiveAlfvenWave/testme.json b/test/MHD/ResistiveAlfvenWave/testme.json index 56ae122ec..fc5d9bc71 100644 --- a/test/MHD/ResistiveAlfvenWave/testme.json +++ b/test/MHD/ResistiveAlfvenWave/testme.json @@ -1,14 +1,16 @@ { "namings": "ini,mpi", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "single": false, + "reconstruction": 2, + "tolerance": 1e-14 + }, "variants": [ { - "dumpname": "dump.0001.dmp", "ini": ["idefix.ini","idefix-rkl.ini"], - "noplot": true, - "single": false, - "reconstruction": 2, - "mpi": [false, true], - "tolerance": 1e-14 + "mpi": [false, true] } ], "when": { diff --git a/test/MHD/ShearingBox/testme.json b/test/MHD/ShearingBox/testme.json index 71ae0ab0d..7166c3e86 100644 --- a/test/MHD/ShearingBox/testme.json +++ b/test/MHD/ShearingBox/testme.json @@ -1,15 +1,17 @@ { "namings": "ini,mpi", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "single": false, + "reconstruction": 2, + "dec": ["2","1","2"], + "tolerance": 1e-14 + }, "variants": [ { - "dumpname": "dump.0001.dmp", "ini": ["idefix.ini","idefix-fargo.ini"], - "noplot": true, - "single": false, - "reconstruction": 2, - "mpi": [false, true], - "dec": ["2","1","2"], - "tolerance": 1e-14 + "mpi": [false, true] } ] } diff --git a/test/MHD/clessTDiffusion/testme.json b/test/MHD/clessTDiffusion/testme.json index d615696f5..a6ca18745 100644 --- a/test/MHD/clessTDiffusion/testme.json +++ b/test/MHD/clessTDiffusion/testme.json @@ -1,15 +1,12 @@ { - "namings": "ini", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini"], - "noplot": true, - "single": false, - "reconstruction": 2, - "mpi": false, - "vectPot": false, - "tolerance": 2e-15 - } - ] + "default": { + "ini": "idefix.ini", + "dumpname": "dump.0001.dmp", + "noplot": true, + "single": false, + "reconstruction": 2, + "mpi": false, + "vectPot": false, + "tolerance": 2e-15 + } } diff --git a/test/MHD/sod-iso/testme.json b/test/MHD/sod-iso/testme.json index 9f5534fbc..459744862 100644 --- a/test/MHD/sod-iso/testme.json +++ b/test/MHD/sod-iso/testme.json @@ -1,33 +1,25 @@ { "namings": "ini,reconstruction,single", + "default": { + "dumpname": "dump.0001.dmp", + "vectPot": false, + "mpi": false, + "standardTest": false, + "tolerance": 0 + }, "variants": [ { - "dumpname": "dump.0001.dmp", "ini": ["idefix.ini","idefix-hll.ini","idefix-hlld.ini","idefix-tvdlf.ini"], - "vectPot": false, "single": false, - "reconstruction": [2,3], - "mpi": false, - "standardTest": false, - "tolerance": 0 + "reconstruction": [2,3] },{ - "dumpname": "dump.0001.dmp", "ini": ["idefix-rk3.ini","idefix-hlld-rk3.ini"], - "vectPot": false, "single": false, - "reconstruction": [4], - "mpi": false, - "standardTest": false, - "tolerance": 0 + "reconstruction": [4] },{ - "dumpname": "dump.0001.dmp", "ini": ["idefix.ini","idefix-hll.ini","idefix-hlld.ini","idefix-tvdlf.ini"], - "vectPot": false, "reconstruction": [2], - "mpi": false, - "single": true, - "standardTest": false, - "tolerance": 0 + "single": true } ], "when": [ diff --git a/test/MHD/sod/testme.json b/test/MHD/sod/testme.json index 1501e3049..b0f6f927b 100644 --- a/test/MHD/sod/testme.json +++ b/test/MHD/sod/testme.json @@ -1,33 +1,28 @@ { "namings": "ini,reconstruction,single", + "default": { + "dumpname": "dump.0001.dmp", + "vectPot": false, + "mpi": false, + "standardTest": false, + "tolerance": 0 + }, "variants": [ { - "dumpname": "dump.0001.dmp", "ini": ["idefix.ini","idefix-hll.ini","idefix-hlld.ini","idefix-tvdlf.ini"], - "vectPot": false, "single": false, "reconstruction": [2,3], - "mpi": false, - "standardTest": false, - "tolerance": 0 + "standardTest": false },{ - "dumpname": "dump.0001.dmp", "ini": ["idefix-rk3.ini","idefix-hlld-rk3.ini"], - "vectPot": false, "single": false, "reconstruction": 4, - "mpi": false, "standardTest": false, "tolerance": 0 },{ - "dumpname": "dump.0001.dmp", "ini": ["idefix.ini","idefix-hll.ini","idefix-hlld.ini","idefix-tvdlf.ini"], - "vectPot": false, "reconstruction": 2, - "mpi": false, - "single": true, - "standardTest": false, - "tolerance": 0 + "single": true } ] } diff --git a/test/MHD/sphBragTDiffusion/testme.json b/test/MHD/sphBragTDiffusion/testme.json index c4cb9a334..79d2ac668 100644 --- a/test/MHD/sphBragTDiffusion/testme.json +++ b/test/MHD/sphBragTDiffusion/testme.json @@ -1,15 +1,12 @@ { - "namings": "ini", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini"], - "noplot": true, - "vectPot": false, - "single": false, - "reconstruction": 2, - "mpi": false, - "tolerance": 2e-15 - } - ] + "default": { + "dumpname": "dump.0001.dmp", + "ini": "idefix.ini", + "noplot": true, + "vectPot": false, + "single": false, + "reconstruction": 2, + "mpi": false, + "tolerance": 2e-15 + } } diff --git a/test/MHD/sphBragViscosity/testme.json b/test/MHD/sphBragViscosity/testme.json index 900a34a77..017a9b625 100644 --- a/test/MHD/sphBragViscosity/testme.json +++ b/test/MHD/sphBragViscosity/testme.json @@ -1,16 +1,13 @@ { - "namings": "ini", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini"], - "noplot": true, - "vectPot": false, - "single": false, - "reconstruction": 2, - "mpi": false, - "standardTest": false, - "tolerance": 1e-15 - } - ] + "default": { + "dumpname": "dump.0001.dmp", + "ini": "idefix.ini", + "noplot": true, + "vectPot": false, + "single": false, + "reconstruction": 2, + "mpi": false, + "standardTest": false, + "tolerance": 1e-15 + } } diff --git a/test/Planet/PlanetMigration2D/testme.json b/test/Planet/PlanetMigration2D/testme.json index 6e1e08537..fa0c71fbc 100644 --- a/test/Planet/PlanetMigration2D/testme.json +++ b/test/Planet/PlanetMigration2D/testme.json @@ -1,16 +1,18 @@ { - "namings": "ini,mpi", + "namings": "mpi", + "default": { + "dumpname": "dump.0001.dmp", + "ini": "idefix.ini", + "noplot": true, + "vectPot": false, + "single": false, + "reconstruction": 2, + "dec": ["2","2"], + "tolerance": 1e-13 + }, "variants": [ { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini"], - "noplot": true, - "vectPot": false, - "single": false, - "reconstruction": 2, - "mpi": [false, true], - "dec": ["2","2"], - "tolerance": 1e-13 + "mpi": [false, true] } ] } diff --git a/test/Planet/PlanetPlanetRK42D/testme.json b/test/Planet/PlanetPlanetRK42D/testme.json index 0181b072f..458fecd6b 100644 --- a/test/Planet/PlanetPlanetRK42D/testme.json +++ b/test/Planet/PlanetPlanetRK42D/testme.json @@ -1,16 +1,18 @@ { - "namings": "ini,mpi", + "namings": "mpi", + "default": { + "ini": "idefix.ini", + "dumpname": "dump.0002.dmp", + "noplot": true, + "vectPot": false, + "single": false, + "reconstruction": 2, + "dec": ["2","2"], + "tolerance": 1e-13 + }, "variants": [ { - "dumpname": "dump.0002.dmp", - "ini": ["idefix.ini"], - "noplot": true, - "vectPot": false, - "single": false, - "reconstruction": 2, "mpi": [false, true], - "dec": ["2","2"], - "tolerance": 1e-13, "multirun": [ { "nonRegressionTest": true, diff --git a/test/Planet/PlanetSpiral2D/testme.json b/test/Planet/PlanetSpiral2D/testme.json index 6e1e08537..fa0c71fbc 100644 --- a/test/Planet/PlanetSpiral2D/testme.json +++ b/test/Planet/PlanetSpiral2D/testme.json @@ -1,16 +1,18 @@ { - "namings": "ini,mpi", + "namings": "mpi", + "default": { + "dumpname": "dump.0001.dmp", + "ini": "idefix.ini", + "noplot": true, + "vectPot": false, + "single": false, + "reconstruction": 2, + "dec": ["2","2"], + "tolerance": 1e-13 + }, "variants": [ { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini"], - "noplot": true, - "vectPot": false, - "single": false, - "reconstruction": 2, - "mpi": [false, true], - "dec": ["2","2"], - "tolerance": 1e-13 + "mpi": [false, true] } ] } diff --git a/test/Planet/PlanetTorque3D/testme.json b/test/Planet/PlanetTorque3D/testme.json index 085fb6c0f..5ef1ba03f 100644 --- a/test/Planet/PlanetTorque3D/testme.json +++ b/test/Planet/PlanetTorque3D/testme.json @@ -1,16 +1,18 @@ { "namings": "ini,mpi", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "vectPot": false, + "single": false, + "reconstruction": 2, + "dec": ["2","2","2"], + "tolerance": 1e-13 + }, "variants": [ { - "dumpname": "dump.0001.dmp", "ini": ["idefix.ini"], - "noplot": true, - "vectPot": false, - "single": false, - "reconstruction": 2, - "mpi": [false, true], - "dec": ["2","2","2"], - "tolerance": 1e-13 + "mpi": [false, true] } ] } diff --git a/test/Planet/PlanetsIsActiveRK52D/testme.json b/test/Planet/PlanetsIsActiveRK52D/testme.json index 30848aecd..1f7e49ebf 100644 --- a/test/Planet/PlanetsIsActiveRK52D/testme.json +++ b/test/Planet/PlanetsIsActiveRK52D/testme.json @@ -1,17 +1,19 @@ { "namings": "ini,mpi", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "vectPot": false, + "single": false, + "reconstruction": 2, + "dec": ["2","2"], + "nonRegressionTest": false, + "tolerance": 1e-13 + }, "variants": [ { - "dumpname": "dump.0001.dmp", "ini": ["idefix-rk4.ini", "idefix-rk5.ini"], - "noplot": true, - "vectPot": false, - "single": false, - "reconstruction": 2, - "mpi": [false, true], - "dec": ["2","2"], - "nonRegressionTest": false, - "tolerance": 1e-13 + "mpi": [false, true] } ] } diff --git a/test/SelfGravity/DustyCollapse/testme.json b/test/SelfGravity/DustyCollapse/testme.json index 8afbcdb6d..208d8a307 100644 --- a/test/SelfGravity/DustyCollapse/testme.json +++ b/test/SelfGravity/DustyCollapse/testme.json @@ -1,16 +1,18 @@ { - "namings": "ini,mpi", + "namings": "mpi", + "default": { + "dumpname": "dump.0001.dmp", + "ini": "idefix.ini", + "noplot": true, + "vectPot": false, + "single": false, + "reconstruction": 2, + "nonRegressionTest": false, + "tolerance": 1e-13 + }, "variants": [ { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini"], - "noplot": true, - "vectPot": false, - "single": false, - "reconstruction": 2, - "mpi": [false, true], - "nonRegressionTest": false, - "tolerance": 1e-13 + "mpi": [false, true] } ] } diff --git a/test/SelfGravity/JeansInstability/testme.json b/test/SelfGravity/JeansInstability/testme.json index bf4819389..cdcfaa60c 100644 --- a/test/SelfGravity/JeansInstability/testme.json +++ b/test/SelfGravity/JeansInstability/testme.json @@ -1,17 +1,19 @@ { "namings": "ini,mpi", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "vectPot": false, + "single": false, + "reconstruction": 2, + "dec": ["2"], + "nonRegressionTest": false, + "tolerance": 1e-13 + }, "variants": [ { - "dumpname": "dump.0001.dmp", "ini": ["idefix.ini","idefix-cg.ini"], - "noplot": true, - "vectPot": false, - "single": false, - "reconstruction": 2, - "mpi": [false, true], - "dec": ["2"], - "nonRegressionTest": false, - "tolerance": 1e-13 + "mpi": [false, true] } ] } diff --git a/test/SelfGravity/RandomSphere/testme.json b/test/SelfGravity/RandomSphere/testme.json index d5cda3135..a3b2fbe94 100644 --- a/test/SelfGravity/RandomSphere/testme.json +++ b/test/SelfGravity/RandomSphere/testme.json @@ -1,14 +1,16 @@ { "namings": "ini,mpi", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "dec": ["2","2","1"], + "nonRegressionTest": false, + "tolerance": 0 + }, "variants": [ { - "dumpname": "dump.0001.dmp", "ini": ["idefix.ini","idefix-cg.ini","idefix-minres.ini"], - "noplot": true, - "mpi": [false, true], - "dec": ["2","2","1"], - "nonRegressionTest": false, - "tolerance": 0 + "mpi": [false, true] } ] } diff --git a/test/SelfGravity/RandomSphereCartesian/testme.json b/test/SelfGravity/RandomSphereCartesian/testme.json index 85f0f3889..0cf3294a9 100644 --- a/test/SelfGravity/RandomSphereCartesian/testme.json +++ b/test/SelfGravity/RandomSphereCartesian/testme.json @@ -1,12 +1,14 @@ { "namings": "ini", + "default": { + "dumpname": "dump.0001.dmp", + "noplot": true, + "nonRegressionTest": false, + "tolerance": 0 + }, "variants": [ { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-cg.ini","idefix-minres.ini","idefix-jacobi.ini"], - "noplot": true, - "nonRegressionTest": false, - "tolerance": 0 + "ini": ["idefix.ini","idefix-cg.ini","idefix-minres.ini","idefix-jacobi.ini"] } ] } diff --git a/test/SelfGravity/UniformCollapse/testme.json b/test/SelfGravity/UniformCollapse/testme.json index 3de00c4df..50e6e9e3d 100644 --- a/test/SelfGravity/UniformCollapse/testme.json +++ b/test/SelfGravity/UniformCollapse/testme.json @@ -1,16 +1,13 @@ { - "namings": "ini", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini"], - "noplot": true, - "single": false, - "reconstruction": 2, - "mpi": false, - "standardTest": false, - "tolerance": 0, - "nonRegressionTest": false - } - ] + "default": { + "dumpname": "dump.0001.dmp", + "ini": "idefix.ini", + "noplot": true, + "single": false, + "reconstruction": 2, + "mpi": false, + "standardTest": false, + "tolerance": 0, + "nonRegressionTest": false + } } diff --git a/test/utils/columnDensity/testme.json b/test/utils/columnDensity/testme.json index 718413c4d..4163c0327 100644 --- a/test/utils/columnDensity/testme.json +++ b/test/utils/columnDensity/testme.json @@ -1,13 +1,15 @@ { - "namings": "ini,mpi", + "namings": "mpi", + "default": { + "ini": "idefix.ini", + "dumpname": "dump.0001.dmp", + "nonRegressionTest": false, + "standardTest": false, + "tolerance": 0 + }, "variants": [ { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini"], - "mpi": [false,true], - "nonRegressionTest": false, - "standardTest": false, - "tolerance": 0 + "mpi": [false,true] } ] } diff --git a/test/utils/lookupTable/testme.json b/test/utils/lookupTable/testme.json index 8ea6f6961..100e561d8 100644 --- a/test/utils/lookupTable/testme.json +++ b/test/utils/lookupTable/testme.json @@ -1,12 +1,9 @@ { - "namings": "ini", - "variants": [ - { - "dumpname": "dump.0001.dmp", - "ini":["idefix.ini"], - "nonRegressionTest": false, - "standardTest": false, - "tolerance": 0 - } - ] + "default": { + "dumpname": "dump.0001.dmp", + "ini": "idefix.ini", + "nonRegressionTest": false, + "standardTest": false, + "tolerance": 0 + } } From 1b729a41656d931cafb614b1f99ba5e3a52db62f Mon Sep 17 00:00:00 2001 From: Sebastien Valat Date: Wed, 22 Apr 2026 10:53:26 +0200 Subject: [PATCH 2/4] test: update doc to document de "default" behavior --- doc/source/testing/testLauncher.rst | 63 ++++++++++++++++------------- 1 file changed, 34 insertions(+), 29 deletions(-) diff --git a/doc/source/testing/testLauncher.rst b/doc/source/testing/testLauncher.rst index aea7f5c3d..ffb80ef9f 100644 --- a/doc/source/testing/testLauncher.rst +++ b/doc/source/testing/testLauncher.rst @@ -144,7 +144,7 @@ For a single basic configuration one can use : .. code-block:: json { - "variants": { + "default": { "dumpname": "dump.0001.dmp", "ini": "idefix.ini", "vectPot": false, @@ -159,7 +159,7 @@ For a single basic configuration one can use : Available parameters -------------------- -The parameters in the ``variants`` dictionnary correspond to the options supported by the +The parameters in the ``default`` dictionnary correspond to the options supported by the :doc:`idfxTest ` script to configure the build and run of *Idefix*. In addition there is some extra keys which are dedicated to the json interpretation layer : @@ -195,22 +195,24 @@ In addition there is some extra keys which are dedicated to the json interpretat Looping over parameters ----------------------- -You might want to explore running Idefix within parameter ranges (configuration files, modes). -For this simply list the values you want as a list. The test script will automatically -generate all combinations. +You might want to explore running *Idefix* within parameter ranges (configuration files, modes). +For this simply list the values you want as a list in tha ``variants`` dictionnary. The test script +will automatically generate all combinations. .. code-block:: json { - "variants": { + "default": { "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-hll.ini"], - "vectPot": [false, true], "single": false, "reconstruction": 2, - "mpi": [false, true], "standardTest": false, "tolerance": 0 + }, + "variants": { + "ini": ["idefix.ini","idefix-hll.ini"], + "vectPot": [false, true], + "mpi": [false, true] } } @@ -245,25 +247,24 @@ can list several sets as a list. Here using single only on half of the modes. .. code-block:: json { + "default": { + "dumpname": "dump.0001.dmp", + "tolerance": 0 + "standardTest": false, + "reconstruction": 2 + }, "variants": [ { - "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini"], + "ini": "idefix.ini", "vectPot": false, "single": false, - "reconstruction": 2, "mpi": [false, true], - "standardTest": false, - "tolerance": 0 },{ - "dumpname": "dump.0001.dmp", - "ini": ["idefix-hll.ini"], + "ini": "idefix-hll.ini", "vectPot": true, "single": true, - "reconstruction": 2, "mpi": [false, true], - "standardTest": false, - "tolerance": 0 + } ] } @@ -284,15 +285,17 @@ the order you want to see them composing the test name. { "namings": "ini,single,mpi", - "variants": { + "default": { "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-hll.ini"], "vectPot": false, - "single": [false, true], "reconstruction": 2, - "mpi": [false, true], "standardTest": false, "tolerance": 0 + }, + "variants": { + "ini": ["idefix.ini","idefix-hll.ini"], + "single": [false, true], + "mpi": [false, true], } } @@ -309,16 +312,18 @@ It is just like if you used and IF statement. { "namings": "ini,single,mpi", - "variants": { + "default": { "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini","idefix-hll.ini"], "vectPot": false, - "single": [false, true], "reconstruction": 2, - "mpi": [false, true], "standardTest": false, "tolerance": 0 }, + "variants": { + "ini": ["idefix.ini","idefix-hll.ini"], + "single": [false, true], + "mpi": [false, true], + }, "when": { "conditions": { "single": true @@ -348,9 +353,9 @@ They are described like : .. code-block:: json { - "variants": { + "default": { "dumpname": "dump.0001.dmp", - "ini": ["idefix.ini"], + "ini": "idefix.ini", "vectPot": false, "single": false, "reconstruction": 2, From f073c9439dde950f55e8b13f3987946f5a2eddfb Mon Sep 17 00:00:00 2001 From: Sebastien Valat Date: Wed, 22 Apr 2026 15:47:02 +0200 Subject: [PATCH 3/4] test: fix missing disabling nonRegressionTest for test/HD/SedovBlastWave in testme.json --- test/HD/SedovBlastWave/testme.json | 1 + 1 file changed, 1 insertion(+) diff --git a/test/HD/SedovBlastWave/testme.json b/test/HD/SedovBlastWave/testme.json index bdf6e7121..ba77c4b7e 100644 --- a/test/HD/SedovBlastWave/testme.json +++ b/test/HD/SedovBlastWave/testme.json @@ -8,6 +8,7 @@ "mpi": true, "dec": [2, 2, 2 ], "standardTest": false, + "nonRegressionTest": false, "tolerance": 0 }, "variants": [ From 69cae79d1eb9a82aebbd1567b55eb9039822027f Mon Sep 17 00:00:00 2001 From: Sebastien Valat Date: Wed, 22 Apr 2026 15:48:09 +0200 Subject: [PATCH 4/4] test: enable logging all streams (log, stdout, sterr) in junit file (to prepare following patches for CI) --- pytest.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pytest.ini b/pytest.ini index b3482664f..33a7f2a95 100644 --- a/pytest.ini +++ b/pytest.ini @@ -2,5 +2,5 @@ markers= default: Test to run by default. python_files="test_*.py" -junit_logging="system-out" +junit_logging="all" junit_log_passing_tests=false