diff --git a/mfc.sh b/mfc.sh index d5647b15aa..bd6d8b919f 100755 --- a/mfc.sh +++ b/mfc.sh @@ -44,7 +44,7 @@ mkdir -p "$(pwd)/build" echo # Run the main.py bootstrap script -python3 "$(pwd)/toolchain/mfc.py" "$@" +python3 "$(pwd)/toolchain/main.py" "$@" code=$? echo diff --git a/tests/02748F0F/case.py b/tests/02748F0F/case.py index 3a9cfbfb3c..2ceaf1b1eb 100644 --- a/tests/02748F0F/case.py +++ b/tests/02748F0F/case.py @@ -126,7 +126,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/043B535A/case.py b/tests/043B535A/case.py index 5bfea6a80f..046aea0ad2 100644 --- a/tests/043B535A/case.py +++ b/tests/043B535A/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/07C33719/case.py b/tests/07C33719/case.py index 3726f0e105..20aa542cb6 100644 --- a/tests/07C33719/case.py +++ b/tests/07C33719/case.py @@ -166,7 +166,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/0879E062/case.py b/tests/0879E062/case.py index 78a320b650..dc7e6a69df 100644 --- a/tests/0879E062/case.py +++ b/tests/0879E062/case.py @@ -131,7 +131,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/09623DE3/case.py b/tests/09623DE3/case.py index 238c112d99..8e009e0955 100644 --- a/tests/09623DE3/case.py +++ b/tests/09623DE3/case.py @@ -167,7 +167,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/0982571B/case.py b/tests/0982571B/case.py index 1a1bd52ef1..166884967f 100644 --- a/tests/0982571B/case.py +++ b/tests/0982571B/case.py @@ -166,7 +166,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/09DAFEBA/case.py b/tests/09DAFEBA/case.py index 68f9592916..61561b8cd9 100644 --- a/tests/09DAFEBA/case.py +++ b/tests/09DAFEBA/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/0A022883/case.py b/tests/0A022883/case.py index 2df2a55b66..15fc4f2ef5 100644 --- a/tests/0A022883/case.py +++ b/tests/0A022883/case.py @@ -151,7 +151,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/0FCCE9F1/case.py b/tests/0FCCE9F1/case.py index 3e94b2b8ee..e014d51aed 100644 --- a/tests/0FCCE9F1/case.py +++ b/tests/0FCCE9F1/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/122713AA/case.py b/tests/122713AA/case.py index cbaa96de60..402f371c91 100644 --- a/tests/122713AA/case.py +++ b/tests/122713AA/case.py @@ -147,7 +147,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/13DFC31D/case.py b/tests/13DFC31D/case.py index ee415130ea..f6c13bfd4f 100644 --- a/tests/13DFC31D/case.py +++ b/tests/13DFC31D/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/14975B87/case.py b/tests/14975B87/case.py index 4f48af4557..dca19a6a2e 100644 --- a/tests/14975B87/case.py +++ b/tests/14975B87/case.py @@ -164,7 +164,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/14B6198D/case.py b/tests/14B6198D/case.py index 6475fbbd24..fd507295f9 100644 --- a/tests/14B6198D/case.py +++ b/tests/14B6198D/case.py @@ -151,7 +151,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/16C03D8E/case.py b/tests/16C03D8E/case.py index 46f7b79fad..92e419d240 100644 --- a/tests/16C03D8E/case.py +++ b/tests/16C03D8E/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/16FBF4C8/case.py b/tests/16FBF4C8/case.py index ed10765d59..e0b76b99aa 100644 --- a/tests/16FBF4C8/case.py +++ b/tests/16FBF4C8/case.py @@ -144,7 +144,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/18431ACB/case.py b/tests/18431ACB/case.py index 70d2b76a72..ebac14888a 100644 --- a/tests/18431ACB/case.py +++ b/tests/18431ACB/case.py @@ -175,7 +175,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/18BDCBC8/case.py b/tests/18BDCBC8/case.py index 35dd4dc641..a85071192b 100644 --- a/tests/18BDCBC8/case.py +++ b/tests/18BDCBC8/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/19E33853/case.py b/tests/19E33853/case.py index 03a5ba5db2..8a81425db3 100644 --- a/tests/19E33853/case.py +++ b/tests/19E33853/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/1C0780C8/case.py b/tests/1C0780C8/case.py index 6c79bf82c1..e856691102 100644 --- a/tests/1C0780C8/case.py +++ b/tests/1C0780C8/case.py @@ -162,7 +162,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/1CCA82F5/case.py b/tests/1CCA82F5/case.py index 3d07f9d1ed..458ad8b165 100644 --- a/tests/1CCA82F5/case.py +++ b/tests/1CCA82F5/case.py @@ -131,7 +131,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/1E738705/case.py b/tests/1E738705/case.py index 98f08af055..139f49244e 100644 --- a/tests/1E738705/case.py +++ b/tests/1E738705/case.py @@ -131,7 +131,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/2060F55A/case.py b/tests/2060F55A/case.py index e12a36ac56..95ead1f9c4 100644 --- a/tests/2060F55A/case.py +++ b/tests/2060F55A/case.py @@ -162,7 +162,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/20AE0551/case.py b/tests/20AE0551/case.py index 862188dc0a..c3a13ebcd3 100644 --- a/tests/20AE0551/case.py +++ b/tests/20AE0551/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/27A13E25/case.py b/tests/27A13E25/case.py index 9835fa2ce2..b2101453e4 100644 --- a/tests/27A13E25/case.py +++ b/tests/27A13E25/case.py @@ -151,7 +151,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/284E0EF5/case.py b/tests/284E0EF5/case.py index 5609185588..7be4b7d315 100644 --- a/tests/284E0EF5/case.py +++ b/tests/284E0EF5/case.py @@ -151,7 +151,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/2A523AC1/case.py b/tests/2A523AC1/case.py index 28031938b8..6b22f0e4fc 100644 --- a/tests/2A523AC1/case.py +++ b/tests/2A523AC1/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/2A6136EF/case.py b/tests/2A6136EF/case.py index bdb1d748d1..b5e2603984 100644 --- a/tests/2A6136EF/case.py +++ b/tests/2A6136EF/case.py @@ -137,7 +137,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/2AB32975/case.py b/tests/2AB32975/case.py index 32f44a54cc..6749375348 100644 --- a/tests/2AB32975/case.py +++ b/tests/2AB32975/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/2E021372/case.py b/tests/2E021372/case.py index 42ffd0c7f3..fe9a7211d7 100644 --- a/tests/2E021372/case.py +++ b/tests/2E021372/case.py @@ -151,7 +151,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/2F35A1FE/case.py b/tests/2F35A1FE/case.py index 01d48c1482..4a090bdb96 100644 --- a/tests/2F35A1FE/case.py +++ b/tests/2F35A1FE/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/2FD933A2/case.py b/tests/2FD933A2/case.py index e37b64c498..95dd965eb6 100644 --- a/tests/2FD933A2/case.py +++ b/tests/2FD933A2/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/301B9153/case.py b/tests/301B9153/case.py index 892ad5ab9d..33812e49dc 100644 --- a/tests/301B9153/case.py +++ b/tests/301B9153/case.py @@ -161,7 +161,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/303B925A/case.py b/tests/303B925A/case.py index 86231016d4..97a7197cff 100644 --- a/tests/303B925A/case.py +++ b/tests/303B925A/case.py @@ -151,7 +151,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/32D0F235/case.py b/tests/32D0F235/case.py index dcf789b938..f29fe806b8 100644 --- a/tests/32D0F235/case.py +++ b/tests/32D0F235/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/34580912/case.py b/tests/34580912/case.py index e072d209e2..4df5a7f6b7 100644 --- a/tests/34580912/case.py +++ b/tests/34580912/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/345A94C0/case.py b/tests/345A94C0/case.py index 09cd5309da..7251672234 100644 --- a/tests/345A94C0/case.py +++ b/tests/345A94C0/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/34DBFE14/case.py b/tests/34DBFE14/case.py index 384360fe5c..ec5b0e234a 100644 --- a/tests/34DBFE14/case.py +++ b/tests/34DBFE14/case.py @@ -151,7 +151,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/361D2A9B/case.py b/tests/361D2A9B/case.py index 81a590f76a..321bb83187 100644 --- a/tests/361D2A9B/case.py +++ b/tests/361D2A9B/case.py @@ -151,7 +151,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/36256906/case.py b/tests/36256906/case.py index a04944b237..5a5d5b0190 100644 --- a/tests/36256906/case.py +++ b/tests/36256906/case.py @@ -166,7 +166,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/38533D07/case.py b/tests/38533D07/case.py index 50d81ca5b4..cdacde696d 100644 --- a/tests/38533D07/case.py +++ b/tests/38533D07/case.py @@ -164,7 +164,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/3974AC7B/case.py b/tests/3974AC7B/case.py index 1bb33d4dd6..ef3f11c47f 100644 --- a/tests/3974AC7B/case.py +++ b/tests/3974AC7B/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/3A8359F6/case.py b/tests/3A8359F6/case.py index 53afed7c86..e5df973667 100644 --- a/tests/3A8359F6/case.py +++ b/tests/3A8359F6/case.py @@ -131,7 +131,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/3AE495F4/case.py b/tests/3AE495F4/case.py index ebc4658b53..56b8d3262e 100644 --- a/tests/3AE495F4/case.py +++ b/tests/3AE495F4/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/3B414AF0/case.py b/tests/3B414AF0/case.py index f600496c5a..2e9a623022 100644 --- a/tests/3B414AF0/case.py +++ b/tests/3B414AF0/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/3BFEAC19/case.py b/tests/3BFEAC19/case.py index 49b4bb9195..8f926db2cd 100644 --- a/tests/3BFEAC19/case.py +++ b/tests/3BFEAC19/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/3C00B89D/case.py b/tests/3C00B89D/case.py index 4c0b1b72c4..f666852444 100644 --- a/tests/3C00B89D/case.py +++ b/tests/3C00B89D/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/3FC6FC4A/case.py b/tests/3FC6FC4A/case.py index c700644442..1a3f8d336e 100644 --- a/tests/3FC6FC4A/case.py +++ b/tests/3FC6FC4A/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/4129A23A/case.py b/tests/4129A23A/case.py index dc97590561..860956898a 100644 --- a/tests/4129A23A/case.py +++ b/tests/4129A23A/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/42B169F5/case.py b/tests/42B169F5/case.py index 2e52037a36..896783b63c 100644 --- a/tests/42B169F5/case.py +++ b/tests/42B169F5/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/461DCB09/case.py b/tests/461DCB09/case.py index 1d5d89c27c..87fb38093c 100644 --- a/tests/461DCB09/case.py +++ b/tests/461DCB09/case.py @@ -131,7 +131,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/46AA7AF8/case.py b/tests/46AA7AF8/case.py index 435784183e..8c3202cad5 100644 --- a/tests/46AA7AF8/case.py +++ b/tests/46AA7AF8/case.py @@ -137,7 +137,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/48B9D0C4/case.py b/tests/48B9D0C4/case.py index d494fa983b..e1c1b845c5 100644 --- a/tests/48B9D0C4/case.py +++ b/tests/48B9D0C4/case.py @@ -164,7 +164,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/48CCE072/case.py b/tests/48CCE072/case.py index 7345a92450..72649cee6c 100644 --- a/tests/48CCE072/case.py +++ b/tests/48CCE072/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/4AEF478A/case.py b/tests/4AEF478A/case.py index be82de17d0..344d04231c 100644 --- a/tests/4AEF478A/case.py +++ b/tests/4AEF478A/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/4D7926CD/case.py b/tests/4D7926CD/case.py index e0f591b2dd..b04ffbd306 100644 --- a/tests/4D7926CD/case.py +++ b/tests/4D7926CD/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/4F2F4ACE/case.py b/tests/4F2F4ACE/case.py index 4a4e495ac8..aa16f2190f 100644 --- a/tests/4F2F4ACE/case.py +++ b/tests/4F2F4ACE/case.py @@ -144,7 +144,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/5010B814/case.py b/tests/5010B814/case.py index 5fddab54ae..9d56297d27 100644 --- a/tests/5010B814/case.py +++ b/tests/5010B814/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/50A8B1FE/case.py b/tests/50A8B1FE/case.py index af8ec9576f..da620478d3 100644 --- a/tests/50A8B1FE/case.py +++ b/tests/50A8B1FE/case.py @@ -137,7 +137,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/5281BD7B/case.py b/tests/5281BD7B/case.py index 6e473da479..8a92701f24 100644 --- a/tests/5281BD7B/case.py +++ b/tests/5281BD7B/case.py @@ -156,7 +156,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/53E13D19/case.py b/tests/53E13D19/case.py index c112f71dc8..644c9d24d9 100644 --- a/tests/53E13D19/case.py +++ b/tests/53E13D19/case.py @@ -138,7 +138,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/541A30DB/case.py b/tests/541A30DB/case.py index 2d428865db..10e581cb7a 100644 --- a/tests/541A30DB/case.py +++ b/tests/541A30DB/case.py @@ -164,7 +164,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/5527832F/case.py b/tests/5527832F/case.py index 097a6274e8..8c70c81f6c 100644 --- a/tests/5527832F/case.py +++ b/tests/5527832F/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/55533234/case.py b/tests/55533234/case.py index bbab76345b..d468f6c11e 100644 --- a/tests/55533234/case.py +++ b/tests/55533234/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/557FF170/case.py b/tests/557FF170/case.py index 06db68dd4a..8a3b8fd2ff 100644 --- a/tests/557FF170/case.py +++ b/tests/557FF170/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/5781A4C2/case.py b/tests/5781A4C2/case.py index e66da5ed71..5dc19d5c08 100644 --- a/tests/5781A4C2/case.py +++ b/tests/5781A4C2/case.py @@ -144,7 +144,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/59B127EF/case.py b/tests/59B127EF/case.py index 8e594b756e..c561914105 100644 --- a/tests/59B127EF/case.py +++ b/tests/59B127EF/case.py @@ -139,7 +139,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/59D05DE9/case.py b/tests/59D05DE9/case.py index bffd8092dc..0874eefa5e 100644 --- a/tests/59D05DE9/case.py +++ b/tests/59D05DE9/case.py @@ -137,7 +137,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/5DAB50B2/case.py b/tests/5DAB50B2/case.py index 09ab1cfd17..85f08cd26e 100644 --- a/tests/5DAB50B2/case.py +++ b/tests/5DAB50B2/case.py @@ -144,7 +144,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/5E2265C4/case.py b/tests/5E2265C4/case.py index e23d1c641f..6cd69e6c57 100644 --- a/tests/5E2265C4/case.py +++ b/tests/5E2265C4/case.py @@ -138,7 +138,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/5E454E32/case.py b/tests/5E454E32/case.py index 946f758013..101eda5547 100644 --- a/tests/5E454E32/case.py +++ b/tests/5E454E32/case.py @@ -150,7 +150,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/5EC236F2/case.py b/tests/5EC236F2/case.py index 2ac9c06e6e..0958071cb0 100644 --- a/tests/5EC236F2/case.py +++ b/tests/5EC236F2/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/5F877BC9/case.py b/tests/5F877BC9/case.py index 62f6f48fbb..b952c531e0 100644 --- a/tests/5F877BC9/case.py +++ b/tests/5F877BC9/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/61FFF3D3/case.py b/tests/61FFF3D3/case.py index 8a7b034daf..4639cf1a78 100644 --- a/tests/61FFF3D3/case.py +++ b/tests/61FFF3D3/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/622DEC78/case.py b/tests/622DEC78/case.py index cffe9bfae1..5b8316ea9e 100644 --- a/tests/622DEC78/case.py +++ b/tests/622DEC78/case.py @@ -166,7 +166,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/6241177B/case.py b/tests/6241177B/case.py index 12217035df..0e09e41031 100644 --- a/tests/6241177B/case.py +++ b/tests/6241177B/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/6249EDDE/case.py b/tests/6249EDDE/case.py index b4dc90ff5f..3e694f86fb 100644 --- a/tests/6249EDDE/case.py +++ b/tests/6249EDDE/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/63850240/case.py b/tests/63850240/case.py index d6e7532d5b..10f73b6c8c 100644 --- a/tests/63850240/case.py +++ b/tests/63850240/case.py @@ -166,7 +166,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/645A26E3/case.py b/tests/645A26E3/case.py index f04c62873a..1a49523875 100644 --- a/tests/645A26E3/case.py +++ b/tests/645A26E3/case.py @@ -144,7 +144,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/64E032D7/case.py b/tests/64E032D7/case.py index 9cb85734ce..9faa424c0a 100644 --- a/tests/64E032D7/case.py +++ b/tests/64E032D7/case.py @@ -151,7 +151,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/66CFF8CC/case.py b/tests/66CFF8CC/case.py index 0c54223f26..8376fc1efb 100644 --- a/tests/66CFF8CC/case.py +++ b/tests/66CFF8CC/case.py @@ -151,7 +151,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/6784C02E/case.py b/tests/6784C02E/case.py index 88155cd2c4..d188a30dc8 100644 --- a/tests/6784C02E/case.py +++ b/tests/6784C02E/case.py @@ -138,7 +138,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/6B22A317/case.py b/tests/6B22A317/case.py index 7b0885c9bc..cfd1de4763 100644 --- a/tests/6B22A317/case.py +++ b/tests/6B22A317/case.py @@ -137,7 +137,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/6B4B738B/case.py b/tests/6B4B738B/case.py index c5b75d0717..1a7ed9161a 100644 --- a/tests/6B4B738B/case.py +++ b/tests/6B4B738B/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/6D24B115/case.py b/tests/6D24B115/case.py index 9a834c0c62..07cca224cd 100644 --- a/tests/6D24B115/case.py +++ b/tests/6D24B115/case.py @@ -131,7 +131,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/6F296065/case.py b/tests/6F296065/case.py index 8168a7f045..60e65e2ecb 100644 --- a/tests/6F296065/case.py +++ b/tests/6F296065/case.py @@ -111,17 +111,17 @@ "patch_icpp(1)%x_centroid": 0.5, "patch_icpp(1)%length_x": 1, "patch_icpp(1)%vel(1)": 0.0, - "patch_icpp(1)%vel(2)": 0.0, + "patch_icpp(1)%vel(2)": 606.15, "patch_icpp(2)%geometry": 3, "patch_icpp(2)%x_centroid": 0.5, "patch_icpp(2)%length_x": 1, "patch_icpp(2)%vel(1)": 0.0, - "patch_icpp(2)%vel(2)": 0.0, + "patch_icpp(2)%vel(2)": 10.0, "patch_icpp(3)%geometry": 3, "patch_icpp(3)%x_centroid": 0.5, "patch_icpp(3)%length_x": 1, "patch_icpp(3)%vel(1)": 0.0, - "patch_icpp(3)%vel(2)": 0.0, + "patch_icpp(3)%vel(2)": 10.0, "relax": "T", "relax_model": 5, "palpha_eps": 0.01, @@ -162,7 +162,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/6FC6A809/case.py b/tests/6FC6A809/case.py index b76a205ef9..92ce7164b5 100644 --- a/tests/6FC6A809/case.py +++ b/tests/6FC6A809/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/7077C99F/case.py b/tests/7077C99F/case.py index 51db3850a2..a13916da16 100644 --- a/tests/7077C99F/case.py +++ b/tests/7077C99F/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/70DAE9E8/case.py b/tests/70DAE9E8/case.py index a5f94e42c0..dd36a0ff3d 100644 --- a/tests/70DAE9E8/case.py +++ b/tests/70DAE9E8/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/727F72ED/case.py b/tests/727F72ED/case.py index b4ed107b08..e77aa942e1 100644 --- a/tests/727F72ED/case.py +++ b/tests/727F72ED/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/728A2A5B/case.py b/tests/728A2A5B/case.py index 05f8064200..db49a3e43b 100644 --- a/tests/728A2A5B/case.py +++ b/tests/728A2A5B/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/729A4333/case.py b/tests/729A4333/case.py index cdbd1a1b87..ad6bb9047c 100644 --- a/tests/729A4333/case.py +++ b/tests/729A4333/case.py @@ -138,7 +138,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/72FD6FF5/case.py b/tests/72FD6FF5/case.py index c4a2ab53e5..630df15a6f 100644 --- a/tests/72FD6FF5/case.py +++ b/tests/72FD6FF5/case.py @@ -164,7 +164,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/730DFD6D/case.py b/tests/730DFD6D/case.py index 353575f786..b20ba63e84 100644 --- a/tests/730DFD6D/case.py +++ b/tests/730DFD6D/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/7374E266/case.py b/tests/7374E266/case.py index 0d9627e5c0..1c728b859b 100644 --- a/tests/7374E266/case.py +++ b/tests/7374E266/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/73B0539E/case.py b/tests/73B0539E/case.py index 7a5e59e103..a6f1e685c6 100644 --- a/tests/73B0539E/case.py +++ b/tests/73B0539E/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/758D0268/case.py b/tests/758D0268/case.py index 5693e3ef9f..2b8d33ec97 100644 --- a/tests/758D0268/case.py +++ b/tests/758D0268/case.py @@ -157,7 +157,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/786DE444/case.py b/tests/786DE444/case.py index 6c7216f564..632d72a0ac 100644 --- a/tests/786DE444/case.py +++ b/tests/786DE444/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/7C8F1BA9/case.py b/tests/7C8F1BA9/case.py index c61ad321b0..3755342822 100644 --- a/tests/7C8F1BA9/case.py +++ b/tests/7C8F1BA9/case.py @@ -157,7 +157,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/7DEA8C54/case.py b/tests/7DEA8C54/case.py index 6eb241e3a1..ca6d2d517d 100644 --- a/tests/7DEA8C54/case.py +++ b/tests/7DEA8C54/case.py @@ -152,7 +152,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/7EFBCDAE/case.py b/tests/7EFBCDAE/case.py index 87fae3667c..4504b07377 100644 --- a/tests/7EFBCDAE/case.py +++ b/tests/7EFBCDAE/case.py @@ -169,7 +169,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/7FC6826B/case.py b/tests/7FC6826B/case.py index 376188b251..29bc448e1a 100644 --- a/tests/7FC6826B/case.py +++ b/tests/7FC6826B/case.py @@ -137,7 +137,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/83291843/case.py b/tests/83291843/case.py index c121c7819a..ac303460c0 100644 --- a/tests/83291843/case.py +++ b/tests/83291843/case.py @@ -151,7 +151,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/8360C26B/case.py b/tests/8360C26B/case.py index 9b7cde1a9e..14510752ad 100644 --- a/tests/8360C26B/case.py +++ b/tests/8360C26B/case.py @@ -151,7 +151,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/83EFC30C/case.py b/tests/83EFC30C/case.py index ac0fe2ea74..29500e6552 100644 --- a/tests/83EFC30C/case.py +++ b/tests/83EFC30C/case.py @@ -131,7 +131,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/84017671/case.py b/tests/84017671/case.py index 1b586cbba2..41ac7a4246 100644 --- a/tests/84017671/case.py +++ b/tests/84017671/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/842C6FFC/case.py b/tests/842C6FFC/case.py index 16be943027..fce767cff6 100644 --- a/tests/842C6FFC/case.py +++ b/tests/842C6FFC/case.py @@ -138,7 +138,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/851F7AE2/case.py b/tests/851F7AE2/case.py index b3c38a6c97..7b8812753a 100644 --- a/tests/851F7AE2/case.py +++ b/tests/851F7AE2/case.py @@ -157,7 +157,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/8A341282/case.py b/tests/8A341282/case.py index e65afe6aff..3a1bf03fcc 100644 --- a/tests/8A341282/case.py +++ b/tests/8A341282/case.py @@ -166,7 +166,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/8A59E8E6/case.py b/tests/8A59E8E6/case.py index 0dc97f07a7..ef709eebb7 100644 --- a/tests/8A59E8E6/case.py +++ b/tests/8A59E8E6/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/8B679445/case.py b/tests/8B679445/case.py index 8750e3d5d7..2b8ad413de 100644 --- a/tests/8B679445/case.py +++ b/tests/8B679445/case.py @@ -164,7 +164,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/8BCBAED8/case.py b/tests/8BCBAED8/case.py index 2fe1a47e28..aa18893b54 100644 --- a/tests/8BCBAED8/case.py +++ b/tests/8BCBAED8/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/8C7AA13B/case.py b/tests/8C7AA13B/case.py index 1645f40b3c..cf0d2c3d33 100644 --- a/tests/8C7AA13B/case.py +++ b/tests/8C7AA13B/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/8E3D99E6/case.py b/tests/8E3D99E6/case.py index 1aea240ef3..5117f5131f 100644 --- a/tests/8E3D99E6/case.py +++ b/tests/8E3D99E6/case.py @@ -125,7 +125,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/8EAC3DA7/case.py b/tests/8EAC3DA7/case.py index a7d47f9e84..c505f54b04 100644 --- a/tests/8EAC3DA7/case.py +++ b/tests/8EAC3DA7/case.py @@ -125,7 +125,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/8FDEE23A/case.py b/tests/8FDEE23A/case.py index 4a254453cd..624ba9327b 100644 --- a/tests/8FDEE23A/case.py +++ b/tests/8FDEE23A/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/939D6718/case.py b/tests/939D6718/case.py index b570880f7b..50f81adb4e 100644 --- a/tests/939D6718/case.py +++ b/tests/939D6718/case.py @@ -166,7 +166,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/9465D0F5/case.py b/tests/9465D0F5/case.py index d723d4e6b6..c8a182c340 100644 --- a/tests/9465D0F5/case.py +++ b/tests/9465D0F5/case.py @@ -138,7 +138,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/98081DA3/case.py b/tests/98081DA3/case.py index 2ff16fa545..d87e2e4a7c 100644 --- a/tests/98081DA3/case.py +++ b/tests/98081DA3/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/9ACD5174/case.py b/tests/9ACD5174/case.py index 4cd83d5d90..1736e870b8 100644 --- a/tests/9ACD5174/case.py +++ b/tests/9ACD5174/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/9CB03CEF/case.py b/tests/9CB03CEF/case.py index 36ff149839..7ace2ee4b8 100644 --- a/tests/9CB03CEF/case.py +++ b/tests/9CB03CEF/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/9DAC4DDC/case.py b/tests/9DAC4DDC/case.py index 8017c1a807..f7b5c2306a 100644 --- a/tests/9DAC4DDC/case.py +++ b/tests/9DAC4DDC/case.py @@ -131,7 +131,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/9EB947DB/case.py b/tests/9EB947DB/case.py index 8bce432b0f..0f6081d2f7 100644 --- a/tests/9EB947DB/case.py +++ b/tests/9EB947DB/case.py @@ -128,7 +128,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/9EF19F0A/case.py b/tests/9EF19F0A/case.py index 1b5690a85d..be830863ce 100644 --- a/tests/9EF19F0A/case.py +++ b/tests/9EF19F0A/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/9F3B58E7/case.py b/tests/9F3B58E7/case.py index 42b1c9453b..ec5714ff30 100644 --- a/tests/9F3B58E7/case.py +++ b/tests/9F3B58E7/case.py @@ -151,7 +151,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/A0B82851/case.py b/tests/A0B82851/case.py index 9e3ded3e9a..389be206fb 100644 --- a/tests/A0B82851/case.py +++ b/tests/A0B82851/case.py @@ -157,7 +157,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/A5C93D62/case.py b/tests/A5C93D62/case.py index e7c23fa0b5..9220e7c011 100644 --- a/tests/A5C93D62/case.py +++ b/tests/A5C93D62/case.py @@ -144,7 +144,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/A60691E7/case.py b/tests/A60691E7/case.py index 90d2b0412a..f6176ff0a5 100644 --- a/tests/A60691E7/case.py +++ b/tests/A60691E7/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/A6AC2E06/case.py b/tests/A6AC2E06/case.py index 92ef620374..3cf9e30690 100644 --- a/tests/A6AC2E06/case.py +++ b/tests/A6AC2E06/case.py @@ -144,7 +144,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/A6E65782/case.py b/tests/A6E65782/case.py index 81c627bffb..d964b65a67 100644 --- a/tests/A6E65782/case.py +++ b/tests/A6E65782/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/A6EEAE2D/case.py b/tests/A6EEAE2D/case.py index 1ab3af5612..6747f1615c 100644 --- a/tests/A6EEAE2D/case.py +++ b/tests/A6EEAE2D/case.py @@ -151,7 +151,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/A83CADB5/case.py b/tests/A83CADB5/case.py index 7b5e81ca9e..3e7a75f646 100644 --- a/tests/A83CADB5/case.py +++ b/tests/A83CADB5/case.py @@ -138,7 +138,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/AACF1BC5/case.py b/tests/AACF1BC5/case.py index 503a74ad47..ec2d51934c 100644 --- a/tests/AACF1BC5/case.py +++ b/tests/AACF1BC5/case.py @@ -157,7 +157,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/AB04C64D/case.py b/tests/AB04C64D/case.py index ce4ca4719c..353ff19b07 100644 --- a/tests/AB04C64D/case.py +++ b/tests/AB04C64D/case.py @@ -166,7 +166,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/AB0BE4E4/case.py b/tests/AB0BE4E4/case.py index 585fbb3901..118e9e8821 100644 --- a/tests/AB0BE4E4/case.py +++ b/tests/AB0BE4E4/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/ABAC3AE3/case.py b/tests/ABAC3AE3/case.py index 4340995a91..4ffbcd1d15 100644 --- a/tests/ABAC3AE3/case.py +++ b/tests/ABAC3AE3/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/AD63A4A5/case.py b/tests/AD63A4A5/case.py index a70403e5c4..29e20f8b86 100644 --- a/tests/AD63A4A5/case.py +++ b/tests/AD63A4A5/case.py @@ -166,7 +166,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/AE37D842/case.py b/tests/AE37D842/case.py index 88b89bb123..e86ce95071 100644 --- a/tests/AE37D842/case.py +++ b/tests/AE37D842/case.py @@ -151,7 +151,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/AED93D34/case.py b/tests/AED93D34/case.py index 5ba049edff..2d75b9a62d 100644 --- a/tests/AED93D34/case.py +++ b/tests/AED93D34/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/AF0BCEE4/case.py b/tests/AF0BCEE4/case.py index cab9401670..4589e493c1 100644 --- a/tests/AF0BCEE4/case.py +++ b/tests/AF0BCEE4/case.py @@ -137,7 +137,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/AF46C382/case.py b/tests/AF46C382/case.py index 854fa376e5..6638b3dd22 100644 --- a/tests/AF46C382/case.py +++ b/tests/AF46C382/case.py @@ -137,7 +137,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/B33E256A/case.py b/tests/B33E256A/case.py index c3436ee5f0..7b87a579f6 100644 --- a/tests/B33E256A/case.py +++ b/tests/B33E256A/case.py @@ -157,7 +157,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/B3AAC9C8/case.py b/tests/B3AAC9C8/case.py index d0809f4c77..cdd89c2e6e 100644 --- a/tests/B3AAC9C8/case.py +++ b/tests/B3AAC9C8/case.py @@ -150,7 +150,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/B3C85904/case.py b/tests/B3C85904/case.py index a608fb1618..4f23aae168 100644 --- a/tests/B3C85904/case.py +++ b/tests/B3C85904/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/B7250A5B/case.py b/tests/B7250A5B/case.py index 92f9808f1b..4d1397ca39 100644 --- a/tests/B7250A5B/case.py +++ b/tests/B7250A5B/case.py @@ -163,7 +163,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/B89B8C70/case.py b/tests/B89B8C70/case.py index f0fee1c278..28dd0092f6 100644 --- a/tests/B89B8C70/case.py +++ b/tests/B89B8C70/case.py @@ -145,7 +145,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/B8F5F1C8/case.py b/tests/B8F5F1C8/case.py index 398a737c82..a390f566d8 100644 --- a/tests/B8F5F1C8/case.py +++ b/tests/B8F5F1C8/case.py @@ -157,7 +157,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/B96AC58F/case.py b/tests/B96AC58F/case.py index 8bc22fa5d8..dfbda89c49 100644 --- a/tests/B96AC58F/case.py +++ b/tests/B96AC58F/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/BD8004FF/case.py b/tests/BD8004FF/case.py index d467ef7d1a..ebac0c5470 100644 --- a/tests/BD8004FF/case.py +++ b/tests/BD8004FF/case.py @@ -157,7 +157,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/BDD3411B/case.py b/tests/BDD3411B/case.py index ea31a28c02..a8fa92df1e 100644 --- a/tests/BDD3411B/case.py +++ b/tests/BDD3411B/case.py @@ -178,7 +178,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/BF46F657/case.py b/tests/BF46F657/case.py index 10f70341a4..dad25df6ca 100644 --- a/tests/BF46F657/case.py +++ b/tests/BF46F657/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/C04741B4/case.py b/tests/C04741B4/case.py index 40063fbd11..ae2155beb6 100644 --- a/tests/C04741B4/case.py +++ b/tests/C04741B4/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/C06849AD/case.py b/tests/C06849AD/case.py index c4bff2a18d..f716a2c11a 100644 --- a/tests/C06849AD/case.py +++ b/tests/C06849AD/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/C36F18FB/case.py b/tests/C36F18FB/case.py index fabafd247c..3c113ea09c 100644 --- a/tests/C36F18FB/case.py +++ b/tests/C36F18FB/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/C4907722/case.py b/tests/C4907722/case.py index 66886e70b4..cf2655c1ee 100644 --- a/tests/C4907722/case.py +++ b/tests/C4907722/case.py @@ -131,7 +131,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/C4A2FAA3/case.py b/tests/C4A2FAA3/case.py index 6cb049b4a6..3612e8eee6 100644 --- a/tests/C4A2FAA3/case.py +++ b/tests/C4A2FAA3/case.py @@ -157,7 +157,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/C5B79059/case.py b/tests/C5B79059/case.py index a1dfae8311..09e35fab98 100644 --- a/tests/C5B79059/case.py +++ b/tests/C5B79059/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/C79E1D3C/case.py b/tests/C79E1D3C/case.py index 6503e8f9ff..3a46122916 100644 --- a/tests/C79E1D3C/case.py +++ b/tests/C79E1D3C/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/C93BE9B5/case.py b/tests/C93BE9B5/case.py index f62b206b98..5e54adb9f7 100644 --- a/tests/C93BE9B5/case.py +++ b/tests/C93BE9B5/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/CC4F7C44/case.py b/tests/CC4F7C44/case.py index f40f6fd1f4..d60a00f045 100644 --- a/tests/CC4F7C44/case.py +++ b/tests/CC4F7C44/case.py @@ -151,7 +151,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/CD3D9660/case.py b/tests/CD3D9660/case.py index d7befd63f3..7e3e444ec1 100644 --- a/tests/CD3D9660/case.py +++ b/tests/CD3D9660/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/CD6DC908/case.py b/tests/CD6DC908/case.py index 352b375aea..217872a8be 100644 --- a/tests/CD6DC908/case.py +++ b/tests/CD6DC908/case.py @@ -138,7 +138,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/CD9D3050/case.py b/tests/CD9D3050/case.py index 94a6869f25..1624492e78 100644 --- a/tests/CD9D3050/case.py +++ b/tests/CD9D3050/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/CE232828/case.py b/tests/CE232828/case.py index 827618017a..7c21ce41a9 100644 --- a/tests/CE232828/case.py +++ b/tests/CE232828/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/CFE87594/case.py b/tests/CFE87594/case.py index 63c19efe19..752f9d8358 100644 --- a/tests/CFE87594/case.py +++ b/tests/CFE87594/case.py @@ -151,7 +151,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/D0045756/case.py b/tests/D0045756/case.py index 502b66e311..19ec0beb24 100644 --- a/tests/D0045756/case.py +++ b/tests/D0045756/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/D3C860B9/case.py b/tests/D3C860B9/case.py index b93d90ac7e..a8bc357ce7 100644 --- a/tests/D3C860B9/case.py +++ b/tests/D3C860B9/case.py @@ -111,17 +111,17 @@ "patch_icpp(1)%x_centroid": 0.5, "patch_icpp(1)%length_x": 1, "patch_icpp(1)%vel(1)": 0.0, - "patch_icpp(1)%vel(2)": 0.0, + "patch_icpp(1)%vel(2)": 606.15, "patch_icpp(2)%geometry": 3, "patch_icpp(2)%x_centroid": 0.5, "patch_icpp(2)%length_x": 1, "patch_icpp(2)%vel(1)": 0.0, - "patch_icpp(2)%vel(2)": 0.0, + "patch_icpp(2)%vel(2)": 10.0, "patch_icpp(3)%geometry": 3, "patch_icpp(3)%x_centroid": 0.5, "patch_icpp(3)%length_x": 1, "patch_icpp(3)%vel(1)": 0.0, - "patch_icpp(3)%vel(2)": 0.0, + "patch_icpp(3)%vel(2)": 10.0, "relax": "T", "relax_model": 6, "palpha_eps": 0.01, @@ -162,7 +162,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/D6BAC936/case.py b/tests/D6BAC936/case.py index 492154dff9..14810dff6e 100644 --- a/tests/D6BAC936/case.py +++ b/tests/D6BAC936/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/D79C3E6F/case.py b/tests/D79C3E6F/case.py index dcaf2c8bf7..c69e3bddf0 100644 --- a/tests/D79C3E6F/case.py +++ b/tests/D79C3E6F/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/D972BA0F/case.py b/tests/D972BA0F/case.py index 562cdc02b0..c25c056028 100644 --- a/tests/D972BA0F/case.py +++ b/tests/D972BA0F/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/DA8AF07E/case.py b/tests/DA8AF07E/case.py index 5980f44a5f..578ce17c1b 100644 --- a/tests/DA8AF07E/case.py +++ b/tests/DA8AF07E/case.py @@ -111,17 +111,17 @@ "patch_icpp(1)%x_centroid": 0.5, "patch_icpp(1)%length_x": 1, "patch_icpp(1)%vel(1)": 0.0, - "patch_icpp(1)%vel(2)": 0.0, + "patch_icpp(1)%vel(2)": 606.15, "patch_icpp(2)%geometry": 3, "patch_icpp(2)%x_centroid": 0.5, "patch_icpp(2)%length_x": 1, "patch_icpp(2)%vel(1)": 0.0, - "patch_icpp(2)%vel(2)": 0.0, + "patch_icpp(2)%vel(2)": 10.0, "patch_icpp(3)%geometry": 3, "patch_icpp(3)%x_centroid": 0.5, "patch_icpp(3)%length_x": 1, "patch_icpp(3)%vel(1)": 0.0, - "patch_icpp(3)%vel(2)": 0.0, + "patch_icpp(3)%vel(2)": 10.0, "relax": "T", "relax_model": 5, "palpha_eps": 0.01, @@ -151,7 +151,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/DB670E50/case.py b/tests/DB670E50/case.py index 7ab8fe0792..f4bd46ffef 100644 --- a/tests/DB670E50/case.py +++ b/tests/DB670E50/case.py @@ -145,7 +145,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/DC46C302/case.py b/tests/DC46C302/case.py index c309a68c67..82d40e364f 100644 --- a/tests/DC46C302/case.py +++ b/tests/DC46C302/case.py @@ -137,7 +137,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/DC9CB97E/case.py b/tests/DC9CB97E/case.py index 2949eb42ab..7b70533061 100644 --- a/tests/DC9CB97E/case.py +++ b/tests/DC9CB97E/case.py @@ -144,7 +144,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/DCB3BC6C/case.py b/tests/DCB3BC6C/case.py index c2ed512803..7adb9b4eb7 100644 --- a/tests/DCB3BC6C/case.py +++ b/tests/DCB3BC6C/case.py @@ -164,7 +164,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/E09A12D9/case.py b/tests/E09A12D9/case.py index a3eebc00ea..deceb6ecb0 100644 --- a/tests/E09A12D9/case.py +++ b/tests/E09A12D9/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/E1352143/case.py b/tests/E1352143/case.py index e069020b97..a70a57af10 100644 --- a/tests/E1352143/case.py +++ b/tests/E1352143/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/E4EFEDB2/case.py b/tests/E4EFEDB2/case.py index c1112c6d37..2258e80257 100644 --- a/tests/E4EFEDB2/case.py +++ b/tests/E4EFEDB2/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/E76D41CE/case.py b/tests/E76D41CE/case.py index 12d8f8f72f..8236bfffa0 100644 --- a/tests/E76D41CE/case.py +++ b/tests/E76D41CE/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/E84967E7/case.py b/tests/E84967E7/case.py index 361d42d190..0aa523703c 100644 --- a/tests/E84967E7/case.py +++ b/tests/E84967E7/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/E8C28D5B/case.py b/tests/E8C28D5B/case.py index 1f3f7360ed..2473559332 100644 --- a/tests/E8C28D5B/case.py +++ b/tests/E8C28D5B/case.py @@ -138,7 +138,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/EAA53889/case.py b/tests/EAA53889/case.py index 0adc10f313..b00de923d1 100644 --- a/tests/EAA53889/case.py +++ b/tests/EAA53889/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/ED728400/case.py b/tests/ED728400/case.py index 251a72abfd..5971023ccd 100644 --- a/tests/ED728400/case.py +++ b/tests/ED728400/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/EF54219C/case.py b/tests/EF54219C/case.py index 49d42380f7..b49d695cc3 100644 --- a/tests/EF54219C/case.py +++ b/tests/EF54219C/case.py @@ -137,7 +137,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/F0E6771E/case.py b/tests/F0E6771E/case.py index ed268fb7a5..cd3b6cc403 100644 --- a/tests/F0E6771E/case.py +++ b/tests/F0E6771E/case.py @@ -157,7 +157,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/F0F175B2/case.py b/tests/F0F175B2/case.py index 481e459d0f..9315c3113b 100644 --- a/tests/F0F175B2/case.py +++ b/tests/F0F175B2/case.py @@ -144,7 +144,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/F1457D58/case.py b/tests/F1457D58/case.py index a911bea6fb..196513d8a3 100644 --- a/tests/F1457D58/case.py +++ b/tests/F1457D58/case.py @@ -166,7 +166,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/F4F6AC27/case.py b/tests/F4F6AC27/case.py index 30dfdc2cc8..69b3ac72c7 100644 --- a/tests/F4F6AC27/case.py +++ b/tests/F4F6AC27/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/F5890628/case.py b/tests/F5890628/case.py index 67521c744b..eb63afdd59 100644 --- a/tests/F5890628/case.py +++ b/tests/F5890628/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/F97573DB/case.py b/tests/F97573DB/case.py index 5f34f6e4ad..29ef59d62d 100644 --- a/tests/F97573DB/case.py +++ b/tests/F97573DB/case.py @@ -123,7 +123,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/F99FBB36/case.py b/tests/F99FBB36/case.py index c9b26aecd4..150c3dfd93 100644 --- a/tests/F99FBB36/case.py +++ b/tests/F99FBB36/case.py @@ -149,7 +149,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/FB822062/case.py b/tests/FB822062/case.py index 62e015e89c..b28167598c 100644 --- a/tests/FB822062/case.py +++ b/tests/FB822062/case.py @@ -150,7 +150,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/FBF808BE/case.py b/tests/FBF808BE/case.py index c6d12b5dc4..a67fb8aae5 100644 --- a/tests/FBF808BE/case.py +++ b/tests/FBF808BE/case.py @@ -136,7 +136,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/FC4D07B6/case.py b/tests/FC4D07B6/case.py index 8e0a592787..f109ec74e7 100644 --- a/tests/FC4D07B6/case.py +++ b/tests/FC4D07B6/case.py @@ -144,7 +144,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/FD891191/case.py b/tests/FD891191/case.py index 1e77af27c0..b16cd6bcee 100644 --- a/tests/FD891191/case.py +++ b/tests/FD891191/case.py @@ -131,7 +131,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/tests/FE3E35C4/case.py b/tests/FE3E35C4/case.py index 961c9716a1..164a96b160 100644 --- a/tests/FE3E35C4/case.py +++ b/tests/FE3E35C4/case.py @@ -138,7 +138,7 @@ 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', } - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' diff --git a/toolchain/bench.yaml b/toolchain/bench.yaml deleted file mode 100644 index 64aa09c2be..0000000000 --- a/toolchain/bench.yaml +++ /dev/null @@ -1,9 +0,0 @@ -- slug: 3D_shockdroplet - path: examples/3D_shockdroplet/case.py - args: [] -- slug: 3D_sphbubcollapse - path: examples/3D_sphbubcollapse/case.py - args: [] -- slug: 3D_turb_mixing - path: examples/3D_turb_mixing/case.py - args: [] diff --git a/toolchain/bootstrap/lint.sh b/toolchain/bootstrap/lint.sh index 48c2cd40e1..a5d6b04d13 100644 --- a/toolchain/bootstrap/lint.sh +++ b/toolchain/bootstrap/lint.sh @@ -2,4 +2,4 @@ log "(venv) Running$MAGENTA pylint$COLOR_RESET on$MAGENTA MFC$COLOR_RESET's $MAGENTA""toolchain$COLOR_RESET." -pylint -d R1722,W0718,C0301,C0116,C0115,C0114,C0410,W0622,W0640,C0103,W1309,C0411,W1514 "$(pwd)/toolchain/" +pylint -d R1722,W0718,C0301,C0116,C0115,C0114,C0410,W0622,W0640,C0103,W1309,C0411,W1514,R0401 "$(pwd)/toolchain/" diff --git a/toolchain/mfc.py b/toolchain/main.py similarity index 100% rename from toolchain/mfc.py rename to toolchain/main.py diff --git a/toolchain/mfc/args.py b/toolchain/mfc/args.py index 996ac8c8e4..a9984ff2c3 100644 --- a/toolchain/mfc/args.py +++ b/toolchain/mfc/args.py @@ -2,11 +2,11 @@ from .build import TARGETS, DEFAULT_TARGETS, DEPENDENCY_TARGETS from .common import MFCException, format_list_to_string -from .test.test import CASES as TEST_CASES -from .packer import packer +from .test.cases import generate_cases from .run.engines import ENGINES from .run.mpi_bins import BINARIES +# pylint: disable=too-many-locals, too-many-statements def parse(config): parser = argparse.ArgumentParser( prog="./mfc.sh", @@ -78,10 +78,12 @@ def add_common_arguments(p, mask = None): binaries = [ b.bin for b in BINARIES ] # === TEST === + test_cases = generate_cases() + add_common_arguments(test, "t") test.add_argument("-l", "--list", action="store_true", help="List all available tests.") - test.add_argument("-f", "--from", default=TEST_CASES[0].get_uuid(), type=str, help="First test UUID to run.") - test.add_argument("-t", "--to", default=TEST_CASES[-1].get_uuid(), type=str, help="Last test UUID to run.") + test.add_argument("-f", "--from", default=test_cases[0].get_uuid(), type=str, help="First test UUID to run.") + test.add_argument("-t", "--to", default=test_cases[-1].get_uuid(), type=str, help="Last test UUID to run.") test.add_argument("-o", "--only", nargs="+", type=str, default=[], metavar="L", help="Only run tests with UUIDs or hashes L.") test.add_argument("-b", "--binary", choices=binaries, type=str, default=None, help="(Serial) Override MPI execution binary") test.add_argument("-r", "--relentless", action="store_true", default=False, help="Run all tests, even if multiple fail.") @@ -134,7 +136,7 @@ def add_common_arguments(p, mask = None): if args["command"] == name: continue - vals, errs = parser.parse_known_args(["-i", "None"]) + vals, _ = parser.parse_known_args(["-i", "None"]) for key, val in vars(vals).items(): if key == "input": args[key] = args.get(key) diff --git a/toolchain/mfc/bench.py b/toolchain/mfc/bench.py index 5137c10f41..5d4ae85dd1 100644 --- a/toolchain/mfc/bench.py +++ b/toolchain/mfc/bench.py @@ -1,62 +1,4 @@ -import os, json, time, typing, datetime, subprocess - -import rich.table - -from .printer import cons -from .state import ARG -from .build import PRE_PROCESS, SIMULATION, build_targets -from .common import system, MFC_SUBDIR -from . import sched +from .common import MFCException def bench(): - build_targets([PRE_PROCESS, SIMULATION]) - - cons.print("[bold]Benchmarking [magenta]simulation[/magenta]:[/bold]") - cons.indent() - - CASES = ["1D_bubblescreen", "1D_exercise_WENO", "1D_kapilashocktube"] - RESULTS = [] - - table = rich.table.Table(show_lines=False, show_edge=False) - table.add_column("Case") - table.add_column("(Simulation) Runtime (s)") - - def __worker(case: str, devices: typing.Set[int]): - nonlocal RESULTS - - system(["./mfc.sh", "run", f"examples/{case}/case.py", "--no-build", "-t", "pre_process"], stdout=subprocess.DEVNULL) - start = time.monotonic() - system(["./mfc.sh", "run", f"examples/{case}/case.py", "--no-build", "-t", "simulation"], stdout=subprocess.DEVNULL) - end = time.monotonic() - runtime = datetime.timedelta(seconds=end - start).total_seconds() - - RESULTS.append({ - "name": f"Simulation: {case}", - "unit": "seconds", - "value": runtime - }) - - table.add_row(case, str(runtime)) - - tasks: typing.List[sched.Task] = [ - sched.Task(1, __worker, [ case ], 1) for case in CASES - ] - - cons.print() - nThreads = min(ARG('jobs'), len(ARG('gpus'))) if ARG("gpu") else ARG('jobs') - if ARG('case_optimization'): - nThreads = 1 - - sched.sched(tasks, nThreads, ARG("gpus")) - cons.print() - cons.unindent() - cons.print("[bold]Benchmark Results:[/bold]") - cons.print() - cons.raw.print(table) - cons.print() - - filepath = os.path.join(MFC_SUBDIR, "bench.json") - with open(filepath, "w") as f: - json.dump(RESULTS, f) - - cons.print(f"[bold green]✓[/bold green] Saved results to [magenta]{filepath}[/magenta].") + raise MFCException("Benchmarks are currently disabled.") diff --git a/toolchain/mfc/build.py b/toolchain/mfc/build.py index dfd2928b5a..2458a9a358 100644 --- a/toolchain/mfc/build.py +++ b/toolchain/mfc/build.py @@ -1,9 +1,8 @@ -import re, os, typing, hashlib, dataclasses +import os, typing, hashlib, dataclasses -from .common import MFCException, system, delete_directory, create_directory -from .state import ARG, CFG -from .printer import cons -from .run import input +from .common import MFCException, system, delete_directory, create_directory +from .state import ARG, CFG +from .run import input @dataclasses.dataclass class MFCTarget: @@ -139,30 +138,30 @@ def configure(self): flags.append(f"-DMFC_MPI={ 'ON' if ARG('mpi') else 'OFF'}") flags.append(f"-DMFC_OpenACC={'ON' if ARG('gpu') else 'OFF'}") - configure = ["cmake"] + flags + ["-S", cmake_dirpath, "-B", build_dirpath] + command = ["cmake"] + flags + ["-S", cmake_dirpath, "-B", build_dirpath] delete_directory(build_dirpath) create_directory(build_dirpath) - if system(configure, no_exception=True) != 0: + if system(command, no_exception=True) != 0: raise MFCException(f"Failed to configure the [bold magenta]{self.name}[/bold magenta] target.") def build(self): input.load({}).generate_fpp(self) - build = ["cmake", "--build", self.get_build_dirpath(), - "--target", self.name, - "--parallel", ARG("jobs"), - "--config", 'Debug' if ARG('debug') else 'Release'] + command = ["cmake", "--build", self.get_build_dirpath(), + "--target", self.name, + "--parallel", ARG("jobs"), + "--config", 'Debug' if ARG('debug') else 'Release'] if ARG('verbose'): - build.append("--verbose") + command.append("--verbose") - system(build, exception_text=f"Failed to build the [bold magenta]{self.name}[/bold magenta] target.") + system(command, exception_text=f"Failed to build the [bold magenta]{self.name}[/bold magenta] target.") def install(self): - install = ["cmake", "--install", self.get_build_dirpath()] + command = ["cmake", "--install", self.get_build_dirpath()] - system(install, exception_text=f"Failed to install the [bold magenta]{self.name}[/bold magenta] target.") + system(command, exception_text=f"Failed to install the [bold magenta]{self.name}[/bold magenta] target.") def clean(self): build_dirpath = self.get_build_dirpath() @@ -170,13 +169,13 @@ def clean(self): if not os.path.isdir(build_dirpath): return - clean = ["cmake", "--build", build_dirpath, "--target", "clean", - "--config", "Debug" if ARG("debug") else "Release" ] + command = ["cmake", "--build", build_dirpath, "--target", "clean", + "--config", "Debug" if ARG("debug") else "Release" ] if ARG("verbose"): - clean.append("--verbose") + command.append("--verbose") - system(clean, exception_text=f"Failed to clean the [bold magenta]{self.name}[/bold magenta] target.") + system(command, exception_text=f"Failed to clean the [bold magenta]{self.name}[/bold magenta] target.") FFTW = MFCTarget('fftw', ['-DMFC_FFTW=ON'], True, False, False, MFCTarget.Dependencies([], [], []), -1) diff --git a/toolchain/mfc/case.py b/toolchain/mfc/case.py index 8e195ce43c..1b342c86ed 100644 --- a/toolchain/mfc/case.py +++ b/toolchain/mfc/case.py @@ -11,7 +11,7 @@ def get_parameters(self) -> str: return self.params.keys() def get_cell_count(self) -> int: - return math.prod([max(1, int(self.params.get(dir, 0))) for dir in {"m", "n", "p"}]) + return math.prod([max(1, int(self.params.get(dir, 0))) for dir in ["m", "n", "p"]]) def has_parameter(self, key: str)-> bool: return key in self.get_parameters() diff --git a/toolchain/mfc/common.py b/toolchain/mfc/common.py index 222dd107aa..44c72201b5 100644 --- a/toolchain/mfc/common.py +++ b/toolchain/mfc/common.py @@ -1,11 +1,10 @@ -import os, re, yaml, typing, shutil, subprocess +import os, yaml, typing, shutil, subprocess + from os.path import abspath, normpath, dirname, realpath from .printer import cons - - MFC_ROOTDIR = normpath(f"{dirname(realpath(__file__))}/../..") MFC_TESTDIR = abspath(f"{MFC_ROOTDIR}/tests") MFC_SUBDIR = abspath(f"{MFC_ROOTDIR}/build") @@ -43,7 +42,7 @@ def system(command: typing.List[str], no_exception: bool = False, exception_text if stdout != subprocess.DEVNULL: cons.print(no_indent=True) - r = subprocess.run(cmd, cwd=cwd, stdout=stdout, stderr=stderr, env=env) + r = subprocess.run(cmd, cwd=cwd, stdout=stdout, stderr=stderr, env=env, check=False) if r.returncode != 0: on_error() @@ -62,7 +61,7 @@ def file_write(filepath: str, content: str): with open(filepath, "w") as f: f.write(content) except IOError as exc: - raise MFCException(f'Failed to write to "{filepath}": {exc}') + raise MFCException(f'Failed to write to "{filepath}": {exc}') from exc def file_read(filepath: str): @@ -70,7 +69,7 @@ def file_read(filepath: str): with open(filepath, "r") as f: return f.read() except IOError as exc: - raise MFCException(f'Failed to read from "{filepath}": {exc}') + raise MFCException(f'Failed to read from "{filepath}": {exc}') from exc def file_load_yaml(filepath: str): @@ -78,7 +77,7 @@ def file_load_yaml(filepath: str): with open(filepath, "r") as f: return yaml.safe_load(f) except (IOError, yaml.YAMLError) as exc: - raise MFCException(f'Failed to load YAML from "{filepath}": {exc}') + raise MFCException(f'Failed to load YAML from "{filepath}": {exc}') from exc def file_dump_yaml(filepath: str, data) -> None: @@ -86,7 +85,7 @@ def file_dump_yaml(filepath: str, data) -> None: with open(filepath, "w") as f: yaml.dump(data, f) except (IOError, yaml.YAMLError) as exc: - raise MFCException(f'Failed to dump YAML to "{filepath}": {exc}.') + raise MFCException(f'Failed to dump YAML to "{filepath}": {exc}.') from exc def delete_file(filepath: str) -> None: @@ -97,9 +96,10 @@ def delete_file(filepath: str) -> None: def create_file(filepath: str) -> None: if not os.path.exists(filepath): try: - open(filepath, "w").close() + with open(filepath, "w"): + pass except IOError as exc: - raise MFCException(f"Failed to create file {filepath}: {exc}") + raise MFCException(f"Failed to create file {filepath}: {exc}") from exc def create_directory(dirpath: str) -> None: @@ -112,12 +112,8 @@ def delete_directory(dirpath: str) -> None: def get_program_output(arguments: typing.List[str] = None, cwd=None): - if arguments is None: - arguments = [] - - proc = subprocess.Popen(arguments, cwd=cwd, stdout=subprocess.PIPE) - - return (proc.communicate()[0].decode(), proc.returncode) + with subprocess.Popen(arguments or [], cwd=cwd, stdout=subprocess.PIPE) as proc: + return (proc.communicate()[0].decode(), proc.returncode) def get_py_program_output(filepath: str, arguments: typing.List[str] = None): @@ -149,7 +145,7 @@ def does_command_exist(s: str) -> bool: # command -v is useful because it allows for finding much more # than with "which". Checkout "man command" - return 0 == os.system(f"command -v {s} > /dev/null 2>&1") + return 0 == os.system(f"command -v '{s}' > /dev/null 2>&1") def format_list_to_string(arr: list, item_style=None, empty=None): @@ -213,7 +209,7 @@ def is_number(x: str) -> bool: if x is None: return False - if isinstance(x, int) or isinstance(x, float): + if isinstance(x, (int, float)): return True try: @@ -222,20 +218,21 @@ def is_number(x: str) -> bool: except ValueError: return False + def get_cpuinfo(): if does_command_exist("lscpu"): # Linux - proc1 = subprocess.Popen(['lscpu'], stdout=subprocess.PIPE,universal_newlines=True) - proc, err = proc1.communicate() - proc = "From lscpu \n" + proc + with subprocess.Popen(['lscpu'], stdout=subprocess.PIPE, universal_newlines=True) as proc: + output = f"From lscpu\n{proc.communicate()[0]}" elif does_command_exist("sysctl"): # MacOS - proc1 = subprocess.Popen(['sysctl', '-a'], stdout=subprocess.PIPE) - proc2 = subprocess.Popen(['grep', 'machdep.cpu'], stdin=proc1.stdout, - stdout=subprocess.PIPE, stderr=subprocess.PIPE,universal_newlines=True) - proc1.stdout.close() # Allow proc1 to receive a SIGPIPE if proc2 exits. - proc, err = proc2.communicate() - proc = "From sysctl -a \n" + proc + with subprocess.Popen(['sysctl', '-a'], stdout=subprocess.PIPE) as proc1: + with subprocess.Popen(['grep', 'machdep.cpu'], stdin=proc1.stdout, + stdout=subprocess.PIPE, stderr=subprocess.PIPE, + universal_newlines=True) as proc2: + proc1.stdout.close() # Allow proc1 to receive a SIGPIPE if proc2 exits. + output = f"From sysctl -a \n{proc2.communicate()[0]}" else: - proc = "No CPU info found" - return "CPU Info: \n" + proc + output = "No CPU info found" + + return f"CPU Info:\n{output}" diff --git a/toolchain/mfc/count.py b/toolchain/mfc/count.py index aed003b4e2..b21962e65c 100644 --- a/toolchain/mfc/count.py +++ b/toolchain/mfc/count.py @@ -11,9 +11,9 @@ def handle_dir(dirpath: str) -> typing.Tuple[typing.List[typing.Tuple[str, int]] for filepath in glob.glob(os.path.join(dirpath, '*.*f*')): with open(filepath) as f: - count = sum(1 if not l.isspace() else 0 for l in f.read().split('\n')) + n = sum(1 if not l.isspace() else 0 for l in f.read().split('\n')) files.append((filepath, count)) - total += count + total += n files.sort(key=lambda x: x[1], reverse=True) @@ -32,8 +32,8 @@ def count(): table.add_column(f"File (in [magenta]{codedir}[/magenta])", justify="left") table.add_column(f"Lines ([cyan]{dircount}[/cyan])", justify="right") - for filepath, count in dirfiles: - table.add_row(f"{os.path.basename(filepath)}", f"[bold cyan]{count}[/bold cyan]") + for filepath, n in dirfiles: + table.add_row(f"{os.path.basename(filepath)}", f"[bold cyan]{n}[/bold cyan]") total += dircount diff --git a/toolchain/mfc/lock.py b/toolchain/mfc/lock.py index 58b9d95a9a..1513a8a43f 100644 --- a/toolchain/mfc/lock.py +++ b/toolchain/mfc/lock.py @@ -18,6 +18,7 @@ class MFCLockData: def init(): + # pylint: disable=global-statement global data if not os.path.exists(common.MFC_LOCK_FILEPATH): @@ -32,6 +33,7 @@ def init(): def load(): + # pylint: disable=global-statement global data d = common.file_load_yaml(common.MFC_LOCK_FILEPATH) @@ -51,12 +53,14 @@ def load(): def write(): + # pylint: disable=global-statement, global-variable-not-assigned global data common.file_dump_yaml(common.MFC_LOCK_FILEPATH, dataclasses.asdict(data)) def switch(to: MFCConfig): + # pylint: disable=global-statement, global-variable-not-assigned global data if to == data.config: diff --git a/toolchain/mfc/packer/pack.py b/toolchain/mfc/packer/pack.py index 2c8d1ba93b..30f6026704 100644 --- a/toolchain/mfc/packer/pack.py +++ b/toolchain/mfc/packer/pack.py @@ -24,12 +24,10 @@ def __repr__(self) -> str: class Pack: entries: typing.Dict[str, PackEntry] - def __init__(self): + def __init__(self, entries: typing.List[PackEntry] = None): self.entries = {} - def __init__(self, entries: typing.List[PackEntry]): - self.entries = {} - for entry in entries: + for entry in entries or []: self.set(entry) def find(self, filepath: str) -> PackEntry: @@ -121,7 +119,7 @@ def compile(casepath: str) -> typing.Tuple[Pack, str]: try: doubles = [ float(e) for e in re.sub(r"[\n\t\s]+", " ", common.file_read(filepath)).strip().split(' ') ] except ValueError: - None, f"Failed to interpret the content of [magenta]{filepath}[/magenta] as a list of floating point numbers." + return None, f"Failed to interpret the content of [magenta]{filepath}[/magenta] as a list of floating point numbers." entries.append(PackEntry(short_filepath,doubles)) diff --git a/toolchain/mfc/packer/packer.py b/toolchain/mfc/packer/packer.py index ea1b5aae3c..98555d8477 100644 --- a/toolchain/mfc/packer/packer.py +++ b/toolchain/mfc/packer/packer.py @@ -37,7 +37,7 @@ def packer(): ARGS()["input"] = os.path.dirname(ARG("input")) out_dir = os.path.sep.join([ARG("input"), ARG("output")]) if ARG("output") is not None else None - p, err = pack(ARG("input"), out_dir) + _, err = pack(ARG("input"), out_dir) if err is not None: raise MFCException(err) elif ARG("packer") == "compare": @@ -58,6 +58,5 @@ def packer(): cons.print() cons.unindent() - else: raise MFCException(f"Unknown packer command: {ARG('packer')}") diff --git a/toolchain/mfc/packer/tol.py b/toolchain/mfc/packer/tol.py index f5de2ad7e6..a8a827a10d 100644 --- a/toolchain/mfc/packer/tol.py +++ b/toolchain/mfc/packer/tol.py @@ -3,9 +3,7 @@ from .pack import Pack from .errors import compute_error, AverageError, Error -class Tolerance(Error): - pass - +Tolerance = Error def is_close(error: Error, tolerance: Tolerance) -> bool: if error.absolute <= tolerance.absolute: @@ -20,6 +18,7 @@ def is_close(error: Error, tolerance: Tolerance) -> bool: return False +# pylint: disable=too-many-return-statements def compare(candidate: Pack, golden: Pack, tol: Tolerance) -> typing.Tuple[Error, str]: # Keep track of the average error avg_err = AverageError() diff --git a/toolchain/mfc/printer.py b/toolchain/mfc/printer.py index d28641d768..dbbd0267bd 100644 --- a/toolchain/mfc/printer.py +++ b/toolchain/mfc/printer.py @@ -23,7 +23,7 @@ def unindent(self, times: int = None): for _ in range(times): self.stack.pop() - def print(self, msg: typing.Any = None, no_indent: bool = False, *args, **kwargs): + def print(self, *args, msg: typing.Any = None, no_indent: bool = False, **kwargs): if msg is None: msg = "" diff --git a/toolchain/mfc/run/engines.py b/toolchain/mfc/run/engines.py index 823eadf89d..195d3c515f 100644 --- a/toolchain/mfc/run/engines.py +++ b/toolchain/mfc/run/engines.py @@ -1,4 +1,4 @@ -import re, os, time, copy, queue, typing, datetime, subprocess, dataclasses, multiprocessing +import re, os, time, copy, typing, datetime, subprocess, dataclasses, multiprocessing from ..state import ARG, ARGS from ..printer import cons @@ -27,13 +27,18 @@ def profiler_prepend(): return [] -@dataclasses.dataclass +@dataclasses.dataclass(init=False) class Engine: - name: str - slug: str + name: str + slug: str + input: MFCInputFile - def init(self, input: MFCInputFile) -> None: - self.input = input + def __init__(self, name: str, slug: str) -> None: + self.name = name + self.slug = slug + + def init(self, _input: MFCInputFile) -> None: + self.input = _input self._init() @@ -52,13 +57,14 @@ def _interactive_working_worker(cmd: typing.List[str], q: multiprocessing.Queue) cmd = [ str(_) for _ in cmd ] cons.print(f"$ {' '.join(cmd)}") result = subprocess.run( - cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True) + cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, check=False) q.put(result) class InteractiveEngine(Engine): def __init__(self) -> None: super().__init__("Interactive", "interactive") + # pylint: disable=attribute-defined-outside-init def _init(self) -> None: self.mpibin = mpi_bins.get_binary() @@ -179,18 +185,18 @@ def get_args(self) -> str: """ def run(self, targets: typing.List[MFCTarget]) -> None: - system = queues.get_system() - cons.print(f"Detected the [bold magenta]{system.name}[/bold magenta] queue system.") + qsystem = queues.get_system() + cons.print(f"Detected the [bold magenta]{qsystem.name}[/bold magenta] queue system.") targets = [SYSCHECK] + targets cons.print(f"Running {format_list_to_string([_.name for _ in targets], 'bold magenta')}:") cons.indent() - self.__create_batch_file(system, targets) + self.__create_batch_file(qsystem, targets) if not ARG("dry_run"): - self.__execute_batch_file(system) + self.__execute_batch_file(qsystem) cons.print("[bold yellow]INFO:[/bold yellow] Batch file submitted! Please check your queue system for the job status.") cons.print("[bold yellow]INFO:[/bold yellow] If an error occurs, please check the generated batch file and error logs for more information.") @@ -210,7 +216,7 @@ def __get_batch_filepath(self): self.__get_batch_filename() ])) - def __generate_prologue(self, system: queues.QueueSystem) -> str: + def __generate_prologue(self, qsystem: queues.QueueSystem) -> str: modules = f"" if does_system_use_modules(): @@ -231,7 +237,7 @@ def __generate_prologue(self, system: queues.QueueSystem) -> str: $(printf "$TABLE_FORMAT_LINE" "Partition:" "{ARG("partition")}" "Walltime:" "{ARG("walltime")}") $(printf "$TABLE_FORMAT_LINE" "Account:" "{ARG("account")}" "Nodes:" "{ARG("nodes")}") $(printf "$TABLE_FORMAT_LINE" "Job Name:" "{ARG("name")}" "Engine" "{ARG("engine")}") -$(printf "$TABLE_FORMAT_LINE" "Queue System:" "{system.name}" "Email:" "{ARG("email")}") +$(printf "$TABLE_FORMAT_LINE" "Queue System:" "{qsystem.name}" "Email:" "{ARG("email")}") END ) @@ -266,14 +272,15 @@ def __evaluate_expression(self, expr: str) -> str: # See if it computable try: # We assume eval is safe because we control the expression. + # pylint: disable=eval-used r = str(eval(expr, ARGS())) return r if not isspace(r) else None except Exception as exc: - raise MFCException(f"BatchEngine: '{expr}' is not a valid expression in the template file. Please check your spelling.") + raise MFCException(f"BatchEngine: '{expr}' is not a valid expression in the template file. Please check your spelling.") from exc - def __batch_evaluate(self, s: str, system: queues.QueueSystem, targets: typing.List[MFCTarget]): + def __batch_evaluate(self, s: str, qsystem: queues.QueueSystem, targets: typing.List[MFCTarget]): replace_list = [ - ("{MFC::PROLOGUE}", self.__generate_prologue(system)), + ("{MFC::PROLOGUE}", self.__generate_prologue(qsystem)), ("{MFC::PROFILER}", ' '.join(profiler_prepend())), ("{MFC::EPILOGUE}", self.__generate_epilogue()), ("{MFC::BINARIES}", ' '.join([f"'{target.get_install_binpath()}'" for target in targets])), @@ -300,23 +307,23 @@ def __batch_evaluate(self, s: str, system: queues.QueueSystem, targets: typing.L return s - def __create_batch_file(self, system: queues.QueueSystem, targets: typing.List[MFCTarget]): + def __create_batch_file(self, qsystem: queues.QueueSystem, targets: typing.List[MFCTarget]): cons.print("> Generating batch file...") filepath = self.__get_batch_filepath() cons.print("> Evaluating template file...") - content = self.__batch_evaluate(system.template, system, targets) + content = self.__batch_evaluate(qsystem.template, qsystem, targets) cons.print("> Writing batch file...") file_write(filepath, content) - def __execute_batch_file(self, queue: queues.QueueSystem): + def __execute_batch_file(self, qsystem: queues.QueueSystem): # We CD to the case directory before executing the batch file so that # any files the queue system generates (like .err and .out) are created # in the correct directory. - cmd = queue.gen_submit_cmd(self.__get_batch_filename()) + cmd = qsystem.gen_submit_cmd(self.__get_batch_filename()) if system(cmd, cwd=self.__get_batch_dirpath()) != 0: - raise MFCException(f"Submitting batch file for {system.name} failed. It can be found here: {self.__get_batch_filepath()}. Please check the file for errors.") + raise MFCException(f"Submitting batch file for {qsystem.name} failed. It can be found here: {self.__get_batch_filepath()}. Please check the file for errors.") ENGINES = [ InteractiveEngine(), BatchEngine() ] diff --git a/toolchain/mfc/run/input.py b/toolchain/mfc/run/input.py index 549ac91ae0..2a2cf8fa06 100644 --- a/toolchain/mfc/run/input.py +++ b/toolchain/mfc/run/input.py @@ -23,7 +23,7 @@ def __is_ic_analytical(self, key: str, val: str) -> bool: if common.is_number(val) or not isinstance(val, str): return False - for array in QPVF_IDX_VARS.keys(): + for array in QPVF_IDX_VARS: if re.match(fr'^patch_icpp\([0-9]+\)%{array}', key): return True @@ -76,7 +76,7 @@ def __contents_equal(str_a: str, str_b: str) -> bool: common.create_directory(inc_dir) fpp_path = os.path.join(inc_dir, f"case.fpp") - opt_fpp = open(fpp_path).read() if os.path.exists(fpp_path) else "" + opt_fpp = common.file_read(fpp_path) if os.path.exists(fpp_path) else "" if __contents_equal(contents, opt_fpp): cons.print("[yellow]INFO:[/yellow] Custom case.fpp file is up to date.") @@ -85,6 +85,7 @@ def __contents_equal(str_a: str, str_b: str) -> bool: cons.print("[yellow]INFO:[/yellow] Writing a custom case.fpp file: --case-optimization configuration has changed.") common.file_write(fpp_path, contents) + # pylint: disable=too-many-locals def __get_pre_fpp(self) -> str: DATA = { 1: {'ptypes': [1, 15, 16], 'sf_idx': 'i, 0, 0'}, @@ -231,8 +232,8 @@ def load(empty_data: dict = None) -> MFCInputFile: if not ARG("input"): if empty_data is None: raise common.MFCException("Please provide an input file.") - else: - load.CACHED_MFCInputFile = MFCInputFile("empty.py", "empty.py", empty_data) + + load.CACHED_MFCInputFile = MFCInputFile("empty.py", "empty.py", empty_data) else: filename: str = ARG("input").strip() diff --git a/toolchain/mfc/run/queues.py b/toolchain/mfc/run/queues.py index dc7d54b063..acb833888c 100644 --- a/toolchain/mfc/run/queues.py +++ b/toolchain/mfc/run/queues.py @@ -1,6 +1,6 @@ import os, typing, dataclasses -from .. import common +from mfc import common from ..state import ARG @dataclasses.dataclass @@ -26,11 +26,11 @@ def __init__(self) -> None: def is_active(self) -> bool: return common.does_command_exist("qsub") - def gen_submit_cmd(self, filename: str) -> typing.List[str]: + def gen_submit_cmd(self, filepath: str) -> typing.List[str]: if ARG("wait"): raise common.MFCException("PBS Queue: Sorry, --wait is unimplemented.") - return ["qsub", filename] + return ["qsub", filepath] class LSFSystem(QueueSystem): @@ -40,13 +40,13 @@ def __init__(self) -> None: def is_active(self) -> bool: return common.does_command_exist("bsub") and common.does_command_exist("bqueues") - def gen_submit_cmd(self, filename: str) -> None: + def gen_submit_cmd(self, filepath: str) -> None: cmd = ["bsub"] if ARG("wait"): cmd += ["--wait"] - return cmd + [filename] + return cmd + [filepath] class SLURMSystem(QueueSystem): @@ -56,13 +56,13 @@ def __init__(self) -> None: def is_active(self) -> bool: return common.does_command_exist("sbatch") - def gen_submit_cmd(self, filename: str) -> None: + def gen_submit_cmd(self, filepath: str) -> None: cmd = ["sbatch"] if ARG("wait"): cmd += ["--wait"] - return cmd + [filename] + return cmd + [filepath] QUEUE_SYSTEMS = [ LSFSystem(), SLURMSystem(), PBSSystem() ] diff --git a/toolchain/mfc/run/run.py b/toolchain/mfc/run/run.py index d46d4de132..10a86b6751 100644 --- a/toolchain/mfc/run/run.py +++ b/toolchain/mfc/run/run.py @@ -67,12 +67,3 @@ def run_target(target: MFCTarget): def run() -> None: run_targets([ get_target(_) for _ in ARG("targets")]) - - -def run_targets_with(targets: typing.List[MFCTarget]): - pass - - -def run_target_with(target: MFCTarget): - run_targets_with([target]) - diff --git a/toolchain/mfc/state.py b/toolchain/mfc/state.py index 1998800870..aacf4fc0e4 100644 --- a/toolchain/mfc/state.py +++ b/toolchain/mfc/state.py @@ -7,6 +7,7 @@ class MFCConfig: gpu: bool = False debug: bool = False + @staticmethod def from_dict(d: dict): """ Create a MFCConfig object from a dictionary with the same keys as the fields of MFCConfig """ @@ -49,13 +50,16 @@ def __str__(self) -> str: def ARG(arg: str) -> typing.Any: + # pylint: disable=global-variable-not-assigned global gARG return gARG[arg] def ARGS() -> dict: + # pylint: disable=global-variable-not-assigned global gARG return gARG def CFG() -> MFCConfig: + # pylint: disable=global-variable-not-assigned global gCFG return gCFG diff --git a/toolchain/mfc/test/case.py b/toolchain/mfc/test/case.py index f30c619caa..aca9cebbd2 100644 --- a/toolchain/mfc/test/case.py +++ b/toolchain/mfc/test/case.py @@ -116,7 +116,7 @@ def run(self, targets: typing.List[typing.Union[str, MFCTarget]], gpus: typing.S binary_option = f"-b {ARG('binary')}" if ARG("binary") is not None else "" case_optimization = "--case-optimization" if ARG("case_optimization") or self.opt else "--no-build" - mfc_script = ".\mfc.bat" if os.name == 'nt' else "./mfc.sh" + mfc_script = ".\\mfc.bat" if os.name == 'nt' else "./mfc.sh" target_names = [ get_target(t).name for t in targets ] @@ -128,7 +128,7 @@ def run(self, targets: typing.List[typing.Union[str, MFCTarget]], gpus: typing.S return subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True, - shell=True) + shell=True, check=False) def get_uuid(self) -> str: return hex(binascii.crc32(hashlib.sha1(str(self.trace).encode()).digest())).upper()[2:].zfill(8) @@ -190,7 +190,7 @@ def create_directory(self): 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', 'c_wrt' : 'T', }} - + if case['p'] != 0: mods['fd_order'] = 1 mods['omega_wrt(1)'] = 'T' @@ -209,6 +209,21 @@ def create_directory(self): def __str__(self) -> str: return f"tests/[bold magenta]{self.get_uuid()}[/bold magenta]: {self.trace}" + def compute_tolerance(self) -> float: + if self.params.get("qbmm", 'F') == 'T': + return 1e-10 + + if self.params.get("bubbles", 'F') == 'T': + return 1e-10 + + if self.params.get("hypoelasticity", 'F') == 'T': + return 1e-7 + + if self.params.get("relax", 'F') == 'T': + return 1e-10 + + return 1e-12 + @dataclasses.dataclass class CaseGeneratorStack: @@ -232,8 +247,9 @@ def pop(self) -> None: def create_case(stack: CaseGeneratorStack, newTrace: str, newMods: dict, ppn: int = None) -> TestCase: mods: dict = {} - for dict in stack.mods: - mods.update(dict) + for mod in stack.mods: + mods.update(mod) + mods.update(newMods) if isinstance(newTrace, str): diff --git a/toolchain/mfc/test/cases.py b/toolchain/mfc/test/cases.py index f6b05daf72..29329e6130 100644 --- a/toolchain/mfc/test/cases.py +++ b/toolchain/mfc/test/cases.py @@ -1,6 +1,6 @@ import typing -from .. import common +from mfc import common from .case import TestCase, create_case, CaseGeneratorStack def get_bc_mods(bc: int, dimInfo): @@ -66,14 +66,15 @@ def get_dimensions(): return r +# pylint: disable=too-many-locals, too-many-statements def generate_cases() -> typing.List[TestCase]: stack, cases = CaseGeneratorStack(), [] - def alter_bcs(dimInfo, dimParams): + def alter_bcs(dimInfo): for bc in [ -1, -2, -4, -5, -6, -7, -8, -9, -10, -11, -12, -3, -15, -16 ]: cases.append(create_case(stack, f"bc={bc}", get_bc_mods(bc, dimInfo))) - def alter_weno(dimInfo, dimParams): + def alter_weno(): for weno_order in [3, 5]: stack.push(f"weno_order={weno_order}", {'weno_order': weno_order}) @@ -100,8 +101,8 @@ def alter_riemann_solvers(num_fluids): stack.push(f"riemann_solver={riemann_solver}", {'riemann_solver': riemann_solver}) cases.append(create_case(stack, "mixture_err", {'mixture_err': 'T'})) - cases.append(create_case(stack, "avg_state=1", {'avg_state': '1'})) - cases.append(create_case(stack, "wave_speeds=2", {'wave_speeds': '2'})) + cases.append(create_case(stack, "avg_state=1", {'avg_state': 1})) + cases.append(create_case(stack, "wave_speeds=2", {'wave_speeds': 2})) if riemann_solver == 2: cases.append(create_case(stack, "model_eqns=3", {'model_eqns': 3})) @@ -114,7 +115,7 @@ def alter_riemann_solvers(num_fluids): stack.pop() - def alter_num_fluids(dimInfo, dimParams): + def alter_num_fluids(): for num_fluids in [1, 2]: stack.push(f"{num_fluids} Fluid(s)", {"num_fluids": num_fluids}) @@ -160,7 +161,7 @@ def alter_num_fluids(dimInfo, dimParams): stack.pop() - def alter_2d(dimInfo, dimParams): + def alter_2d(): stack.push("Axisymmetric", { 'num_fluids' : 2, 'bc_y%beg': -2, 'cyl_coord': 'T', 'fluid_pp(2)%gamma': 2.5, 'fluid_pp(2)%pi_inf': 0.0, 'patch_icpp(1)%alpha_rho(1)': 0.81, @@ -187,7 +188,7 @@ def alter_2d(dimInfo, dimParams): stack.pop() stack.pop() - def alter_3d(dimInfo, dimParams): + def alter_3d(): stack.push("Cylindrical", { 'bc_y%beg': -14, 'bc_z%beg': -1, 'bc_z%end': -1, 'cyl_coord': 'T', 'x_domain%beg': 0.E+00, 'x_domain%end': 5.E+00, 'y_domain%beg': 0.E+00, 'y_domain%end': 1.E+00, 'z_domain%beg': 0.E+00, @@ -226,13 +227,13 @@ def alter_3d(dimInfo, dimParams): stack.pop() stack.pop() - def alter_ppn(dimInfo, dimParams): + def alter_ppn(dimInfo): if len(dimInfo[0]) == 3: cases.append(create_case(stack, '2 MPI Ranks', {'m': 29, 'n': 29, 'p': 49}, ppn=2)) else: cases.append(create_case(stack, '2 MPI Ranks', {}, ppn=2)) - def alter_bubbles(dimInfo, dimParams): + def alter_bubbles(dimInfo): if len(dimInfo[0]) > 0: stack.push("Bubbles", {"bubbles": 'T'}) @@ -287,7 +288,7 @@ def alter_bubbles(dimInfo, dimParams): stack.push('Non-polytropic', { 'polytropic': 'F'}) cases.append(create_case(stack, '', {})) - for i in range(7): + for _ in range(7): stack.pop() if len(dimInfo[0]) >= 2: @@ -296,7 +297,7 @@ def alter_bubbles(dimInfo, dimParams): if len(dimInfo[0]) >= 3: stack.pop() - def alter_hypoelasticity(dimInfo, dimParams): + def alter_hypoelasticity(dimInfo): # Hypoelasticity checks for num_fluids in [1,2]: stack.push(f"Hypoelasticity -> {num_fluids} Fluid(s)", { @@ -345,10 +346,10 @@ def alter_hypoelasticity(dimInfo, dimParams): stack.pop() if len(dimInfo[0]) == 3: - for i in range(2): + for _ in range(2): stack.pop() - def alter_phasechange(dimInfo, dimParams): + def alter_phasechange(dimInfo): ndims = len(dimInfo[0]) # Phase Change checks @@ -416,7 +417,7 @@ def alter_phasechange(dimInfo, dimParams): if num_fluids == 3: stack.pop() - def alter_viscosity(dimInfo, dimParams): + def alter_viscosity(dimInfo): # Viscosity & bubbles checks if len(dimInfo[0]) > 0: stack.push("Viscosity -> Bubbles", @@ -456,25 +457,25 @@ def alter_viscosity(dimInfo, dimParams): stack.push('bubble_model=3', {'bubble_model': 3}) cases.append(create_case(stack, '', {})) - for i in range(5): + for _ in range(5): stack.pop() def foreach_dimension(): for dimInfo, dimParams in get_dimensions(): stack.push(f"{len(dimInfo[0])}D", dimParams) - alter_bcs (dimInfo, dimParams) - alter_weno(dimInfo, dimParams) - alter_num_fluids(dimInfo, dimParams) + alter_bcs(dimInfo) + alter_weno() + alter_num_fluids() if len(dimInfo[0]) == 2: - alter_2d(dimInfo, dimParams) + alter_2d() if len(dimInfo[0]) == 3: - alter_3d(dimInfo, dimParams) - alter_ppn(dimInfo, dimParams) + alter_3d() + alter_ppn(dimInfo) stack.push('', {'dt': [1e-07, 1e-06, 1e-06][len(dimInfo[0])-1]}) - alter_bubbles(dimInfo, dimParams) - alter_hypoelasticity(dimInfo, dimParams) - alter_phasechange(dimInfo, dimParams) - alter_viscosity(dimInfo, dimParams) + alter_bubbles(dimInfo) + alter_hypoelasticity(dimInfo) + alter_phasechange(dimInfo) + alter_viscosity(dimInfo) stack.pop() stack.pop() diff --git a/toolchain/mfc/test/test.py b/toolchain/mfc/test/test.py index e5fdd9aa8d..73986da835 100644 --- a/toolchain/mfc/test/test.py +++ b/toolchain/mfc/test/test.py @@ -16,22 +16,21 @@ from ..packer import packer -CASES = generate_cases() nFAIL = 0 -def __filter(): - global CASES +def __filter(cases_): + cases = cases_[:] # Check "--from" and "--to" exist and are in the right order bFoundFrom, bFoundTo = (False, False) from_i = -1 - for i, case in enumerate(CASES): + for i, case in enumerate(cases): if case.get_uuid() == ARG("from"): from_i = i bFoundFrom = True # Do not "continue" because "--to" might be the same as "--from" if bFoundFrom and case.get_uuid() == ARG("to"): - CASES = CASES[from_i:i+1] + cases = cases[from_i:i+1] bFoundTo = True break @@ -39,7 +38,7 @@ def __filter(): raise MFCException("Testing: Your specified range [--from,--to] is incorrect. Please ensure both IDs exist and are in the correct order.") if len(ARG("only")) > 0: - for i, case in enumerate(CASES[:]): + for i, case in enumerate(cases[:]): case: TestCase doKeep = False @@ -49,26 +48,28 @@ def __filter(): break if not doKeep: - CASES.remove(case) + cases.remove(case) - if not ARG("mpi"): - for case in CASES[:]: - if case.ppn > 1: - CASES.remove(case) + for case in cases[:]: + if case.ppn > 1 and not ARG("mpi"): + cases.remove(case) if ARG("percent") == 100: - return + return cases - CASES = sample(CASES, k=int(len(CASES)*ARG("percent")/100.0)) + return sample(cases, k=int(len(cases)*ARG("percent")/100.0)) def test(): - global CASES, nFAIL + # pylint: disable=global-statement, global-variable-not-assigned + global nFAIL + + cases = generate_cases() - # Delete UUIDs that are not in the list of CASES from tests/ + # Delete UUIDs that are not in the list of cases from tests/ if ARG("remove_old_tests"): dir_uuids = set(os.listdir(common.MFC_TESTDIR)) - new_uuids = set([case.get_uuid() for case in CASES]) + new_uuids = { case.get_uuid() for case in cases } for old_uuid in dir_uuids - new_uuids: cons.print(f"[bold red]Deleting:[/bold red] {old_uuid}") @@ -76,7 +77,7 @@ def test(): return - __filter() + cases = __filter(cases) if ARG("list"): table = rich.table.Table(title="MFC Test Cases", box=rich.table.box.SIMPLE) @@ -84,7 +85,7 @@ def test(): table.add_column("UUID", style="bold magenta", justify="center") table.add_column("Trace") - for case in CASES: + for case in cases: table.add_row(case.get_uuid(), case.trace) rich.print(table) @@ -102,77 +103,65 @@ def test(): if len(ARG("only")) > 0: range_str = "Only " + format_list_to_string(ARG("only"), "bold magenta", "Nothing to run") - cons.print(f"[bold]Test {format_list_to_string([ x.name for x in codes ], 'magenta')}[/bold] | {range_str} ({len(CASES)} test{'s' if len(CASES) != 1 else ''})") + cons.print(f"[bold]Test {format_list_to_string([ x.name for x in codes ], 'magenta')}[/bold] | {range_str} ({len(cases)} test{'s' if len(cases) != 1 else ''})") cons.indent() - # Run CASES with multiple threads (if available) + # Run cases with multiple threads (if available) cons.print() cons.print(" tests/[bold magenta]UUID[/bold magenta] (s) Summary") cons.print() - # Select the correct number of threads to use to launch test CASES + # Select the correct number of threads to use to launch test cases # We can't use ARG("jobs") when the --case-optimization option is set # because running a test case may cause it to rebuild, and thus - # interfere with the other test CASES. It is a niche feature so we won't + # interfere with the other test cases. It is a niche feature so we won't # engineer around this issue (for now). sched.sched( - [ sched.Task(ppn=case.ppn, func=handle_case, args=[case], load=case.get_cell_count()) for case in CASES ], + [ sched.Task(ppn=case.ppn, func=handle_case, args=[case], load=case.get_cell_count()) for case in cases ], ARG("jobs"), ARG("gpus")) cons.print() if nFAIL == 0: cons.print("Tested Simulation [bold green]✓[/bold green]") else: - if nFAIL == 1: - raise MFCException("Testing: There was [bold red]1[/bold red] failure.") - else: - raise MFCException(f"Testing: There were [bold red]{nFAIL}[/bold red] failures.") + raise MFCException(f"Testing: Encountered [bold red]{nFAIL}[/bold red] failure(s).") cons.unindent() -def _handle_case(test: TestCase, devices: typing.Set[int]): +# pylint: disable=too-many-locals, too-many-branches, too-many-statements +def _handle_case(case: TestCase, devices: typing.Set[int]): start_time = time.time() - if test.params.get("qbmm", 'F') == 'T': - tol = 1e-10 - elif test.params.get("bubbles", 'F') == 'T': - tol = 1e-10 - elif test.params.get("hypoelasticity", 'F') == 'T': - tol = 1e-7 - elif test.params.get("relax", 'F') == 'T': - tol = 1e-10 - else: - tol = 1e-12 + tol = case.compute_tolerance() - test.delete_output() - test.create_directory() + case.delete_output() + case.create_directory() - cmd = test.run([PRE_PROCESS, SIMULATION], gpus=devices) + cmd = case.run([PRE_PROCESS, SIMULATION], gpus=devices) - out_filepath = os.path.join(test.get_dirpath(), "out_pre_sim.txt") + out_filepath = os.path.join(case.get_dirpath(), "out_pre_sim.txt") common.file_write(out_filepath, cmd.stdout) if cmd.returncode != 0: cons.print(cmd.stdout) - raise MFCException(f"Test {test}: Failed to execute MFC.") + raise MFCException(f"Test {case}: Failed to execute MFC.") - pack, err = packer.pack(test.get_dirpath()) + pack, err = packer.pack(case.get_dirpath()) if err is not None: - raise MFCException(f"Test {test}: {err}") + raise MFCException(f"Test {case}: {err}") if pack.has_NaNs(): - raise MFCException(f"Test {test}: NaNs detected in the case.") + raise MFCException(f"Test {case}: NaNs detected in the case.") - golden_filepath = os.path.join(test.get_dirpath(), "golden.txt") - golden_meta_filepath = os.path.join(test.get_dirpath(), "golden-metadata.txt") + golden_filepath = os.path.join(case.get_dirpath(), "golden.txt") if ARG("generate"): common.delete_file(golden_filepath) pack.save(golden_filepath) else: if not os.path.isfile(golden_filepath): - raise MFCException(f"Test {test}: The golden file does not exist! To generate golden files, use the '--generate' flag.") + raise MFCException(f"Test {case}: The golden file does not exist! To generate golden files, use the '--generate' flag.") golden = packer.load(golden_filepath) @@ -185,18 +174,18 @@ def _handle_case(test: TestCase, devices: typing.Set[int]): else: err, msg = packtol.compare(pack, packer.load(golden_filepath), packtol.Tolerance(tol, tol)) if msg is not None: - raise MFCException(f"Test {test}: {msg}") + raise MFCException(f"Test {case}: {msg}") if ARG("test_all"): - test.delete_output() - cmd = test.run([PRE_PROCESS, SIMULATION, POST_PROCESS], gpus=devices) - out_filepath = os.path.join(test.get_dirpath(), "out_post.txt") + case.delete_output() + cmd = case.run([PRE_PROCESS, SIMULATION, POST_PROCESS], gpus=devices) + out_filepath = os.path.join(case.get_dirpath(), "out_post.txt") common.file_write(out_filepath, cmd.stdout) - for t_step in [ i*test["t_step_save"] for i in range(0, math.floor(test["t_step_stop"] / test["t_step_save"]) + 1) ]: - silo_filepath = os.path.join(test.get_dirpath(), 'silo_hdf5', 'p0', f'{t_step}.silo') + for t_step in [ i*case["t_step_save"] for i in range(0, math.floor(case["t_step_stop"] / case["t_step_save"]) + 1) ]: + silo_filepath = os.path.join(case.get_dirpath(), 'silo_hdf5', 'p0', f'{t_step}.silo') if not os.path.exists(silo_filepath): - silo_filepath = os.path.join(test.get_dirpath(), 'silo_hdf5', 'p_all', 'p0', f'{t_step}.silo') + silo_filepath = os.path.join(case.get_dirpath(), 'silo_hdf5', 'p_all', 'p0', f'{t_step}.silo') h5dump = f"{HDF5.get_install_dirpath()}/bin/h5dump" @@ -209,23 +198,24 @@ def _handle_case(test: TestCase, devices: typing.Set[int]): output, err = get_program_output([h5dump, silo_filepath]) if err != 0: - raise MFCException(f"""Test {test}: Failed to run h5dump. You can find the run's output in {out_filepath}, and the case dictionary in {os.path.join(test.get_dirpath(), "case.py")}.""") + raise MFCException(f"""Test {case}: Failed to run h5dump. You can find the run's output in {out_filepath}, and the case dictionary in {os.path.join(test.get_dirpath(), "case.py")}.""") if "nan," in output: - raise MFCException(f"""Test {test}: Post Process has detected a NaN. You can find the run's output in {out_filepath}, and the case dictionary in {os.path.join(test.get_dirpath(), "case.py")}.""") + raise MFCException(f"""Test {case}: Post Process has detected a NaN. You can find the run's output in {out_filepath}, and the case dictionary in {os.path.join(test.get_dirpath(), "case.py")}.""") if "inf," in output: - raise MFCException(f"""Test {test}: Post Process has detected an Infinity. You can find the run's output in {out_filepath}, and the case dictionary in {os.path.join(test.get_dirpath(), "case.py")}.""") + raise MFCException(f"""Test {case}: Post Process has detected an Infinity. You can find the run's output in {out_filepath}, and the case dictionary in {os.path.join(test.get_dirpath(), "case.py")}.""") - test.delete_output() + case.delete_output() end_time = time.time() duration = end_time - start_time - cons.print(f" [bold magenta]{test.get_uuid()}[/bold magenta] {duration:6.2f} {test.trace}") + cons.print(f" [bold magenta]{case.get_uuid()}[/bold magenta] {duration:6.2f} {case.trace}") -def handle_case(test: TestCase, devices: typing.Set[int]): +def handle_case(case: TestCase, devices: typing.Set[int]): + # pylint: disable=global-statement global nFAIL nAttempts = 0 @@ -234,15 +224,15 @@ def handle_case(test: TestCase, devices: typing.Set[int]): nAttempts += 1 try: - _handle_case(test, devices) + _handle_case(case, devices) except Exception as exc: if nAttempts < ARG("max_attempts"): - cons.print(f"[bold yellow] Attempt {nAttempts}: Failed test {test.get_uuid()}. Retrying...[/bold yellow]") + cons.print(f"[bold yellow] Attempt {nAttempts}: Failed test {case.get_uuid()}. Retrying...[/bold yellow]") continue nFAIL += 1 - cons.print(f"[bold red]Failed test {test} after {nAttempts} attempt(s).[/bold red]") + cons.print(f"[bold red]Failed test {case} after {nAttempts} attempt(s).[/bold red]") if ARG("relentless"): cons.print(f"{exc}")