diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 518dacf800..879b4c7c91 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -11,7 +11,12 @@ jobs: docs: name: Build & Publish runs-on: ubuntu-latest - + + if: github.repository == 'MFlowCode/MFC' + concurrency: + group: docs-publish + cancel-in-progress: true + steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/phoenix/submit.sh b/.github/workflows/phoenix/submit.sh new file mode 100644 index 0000000000..d82d6aa5aa --- /dev/null +++ b/.github/workflows/phoenix/submit.sh @@ -0,0 +1,63 @@ +#!/bin/bash + +set -e + +usage() { + echo "Usage: $0 [script.sh] [cpu|gpu]" +} + +if [ ! -z "$1" ]; then + sbatch_script_contents=`cat $1` +else + usage + exit 1 +fi + +sbatch_cpu_opts="\ +#SBATCH -p cpu-small # partition +#SBATCH --ntasks-per-node=24 # Number of cores per node required +#SBATCH --mem-per-cpu=2G # Memory per core\ +" + +sbatch_gpu_opts="\ +#SBATCH -CV100-16GB +#SBATCH -G2\ +" + +if [ "$2" == "cpu" ]; then + sbatch_device_opts="$sbatch_cpu_opts" +elif [ "$2" == "gpu" ]; then + sbatch_device_opts="$sbatch_gpu_opts" +else + usage + exit 1 +fi + +job_slug="`basename "$1" | sed 's/\.sh$//' | sed 's/[^a-zA-Z0-9]/-/g'`-$2" + +sbatch </.fpp, using a # custom command, instruct CMake how to generate a file with path # -# src//autogen/.f90 +# src//fypp/.f90 # # by running Fypp on /.fpp. It is important to understand # that this does not actually run the pre-processor. Rather, it instructs -# CMake what to do when it finds a src//autogen/.f90 path +# CMake what to do when it finds a src//fypp/.f90 path # in the source list for a target. Thus, an association is made from an .f90 # file to its corresponding .fpp file (if applicable) even though the # generation is of the form .fpp -> .f90. @@ -223,7 +223,7 @@ endif() # one of them is modified). # # .fpp files in src/common are treated as if they were in src/ (not -# pre-processed to src/common/autogen/) so as not to clash with other targets' +# pre-processed to src/common/fypp/) so as not to clash with other targets' # .fpp files (this has caused problems in the past). # # * Export, in the variable _SRCs, a list of all source files (.f90) @@ -250,7 +250,7 @@ macro(HANDLE_SOURCES target useCommon) list(APPEND ${target}_SRCs ${common_F90s}) endif() - # src/[,common]/*.fpp -> src//autogen/*.f90 + # src/[,common]/*.fpp -> src//fypp/*.f90 file(GLOB ${target}_FPPs CONFIGURE_DEPENDS "${${target}_DIR}/*.fpp") if (${useCommon}) file(GLOB common_FPPs CONFIGURE_DEPENDS "${common_DIR}/*.fpp") @@ -259,22 +259,22 @@ macro(HANDLE_SOURCES target useCommon) # Locate src/[,common]/include/*.fpp file(GLOB ${target}_incs CONFIGURE_DEPENDS "${${target}_DIR}/include/*.fpp" - "${CMAKE_CURRENT_BINARY_DIR}/include/*.fpp") + "${CMAKE_BINARY_DIR}/include/${target}/*.fpp") if (${useCommon}) file(GLOB common_incs CONFIGURE_DEPENDS "${common_DIR}/include/*.fpp") list(APPEND ${target}_incs ${common_incs}) endif() - file(MAKE_DIRECTORY "${${target}_DIR}/autogen") + file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/fypp/${target}") foreach(fpp ${${target}_FPPs}) cmake_path(GET fpp FILENAME fpp_filename) - set(f90 "${${target}_DIR}/autogen/${fpp_filename}.f90") + set(f90 "${CMAKE_BINARY_DIR}/fypp/${target}/${fpp_filename}.f90") add_custom_command( OUTPUT ${f90} COMMAND ${FYPP_EXE} -m re - -I "${CMAKE_CURRENT_BINARY_DIR}/include" + -I "${CMAKE_BINARY_DIR}/include/${target}" -I "${${target}_DIR}/include" -I "${common_DIR}/include" -I "${common_DIR}" diff --git a/docs/documentation/running.md b/docs/documentation/running.md index ffba4ec909..ceaa4a0f1b 100644 --- a/docs/documentation/running.md +++ b/docs/documentation/running.md @@ -2,7 +2,31 @@ MFC can be run using `mfc.sh`'s `run` command. It supports both interactive and batch execution, the latter being designed for multi-socket systems, namely supercomputers, equipped with a scheduler such as PBS, SLURM, and LSF. -A full (and updated) list of available arguments can be acquired with `./mfc.sh run -h`. +A full (and updated) list of available arguments can be acquired with `./mfc.sh run -h`. + +MFC supports running simulations locally (Linux, MacOS, and Windows) as well as +several supercomputer clusters, both interactively and through batch submission. + +> [!IMPORTANT] +> Running simulations locally should work out of the box. On supported clusters, +> you can append `-c ` on the command line to instruct the MFC toolchain +> to make use of the template file `toolchain/templates/.mako`. You can +> browse that directory and contribute your own files. Since systems and their schedulers +> do not have a standardized syntax to request certain resources, MFC can only provide +> support for a restricted subset of common or user-contributed configuration options. +> +> Adding a new template file or modifying an existing one will most likely be required if: +> - You are on a cluster that does not have a template yet. +> - Your cluster is configured with SLURM but interactive job launches fail when +> using `srun`. You might need to invoke `mpirun` instead. +> - Something in the existing default or computer template file is incompatible with +> your system or does not provide a feature you need. +> +> If `-c ` is left unspecified, it defaults to `-c default`. + +Additional flags can be appended to the MPI executable call using the `-f` (i.e `--flags`) option. + +Please refer to `./mfc.sh run -h` for a complete list of arguments and options, along with their defaults. ## Interactive Execution @@ -32,24 +56,16 @@ using 4 cores: $ ./mfc.sh run examples/2D_shockbubble/case.py -t simulation post_process -n 4 ``` -On some computer clusters, MFC might select the wrong MPI program to execute your application -because it uses a general heuristic for its selection. Notably, `srun` is known to fail on some SLURM -systems when using GPUs or MPI implementations from different vendors, whereas `mpirun` functions properly. To override and manually specify which -MPI program you wish to run your application with, please use the `-b ` option (i.e `--binary`). - -Additional flags can be appended to the MPI executable call using the `-f` (i.e `--flags`) option. - -Please refer to `./mfc.sh run -h` for a complete list of arguments and options, along with their defaults. - ## Batch Execution The MFC detects which scheduler your system is using and handles the creation and execution of batch scripts. -The batch engine is requested with the `-e batch` option. -Whereas the interactive engine can execute all of MFC's codes in succession, the batch engine requires you to only specify one target with the `-t` option. -The number of nodes and GPUs can, respectively be specified with the `-N` (i.e `--nodes`) and `-g` (i.e `--gpus-per-node`) options. +The batch engine is requested via the `-e batch` option. +The number of nodes can be specified with the `-N` (i.e `--nodes`) option. + +We provide a list of (baked-in) submission batch scripts in the `toolchain/templates` folder. ```console -$ ./mfc.sh run examples/2D_shockbubble/case.py -e batch -N 2 -n 4 -g 4 -t simulation +$ ./mfc.sh run examples/2D_shockbubble/case.py -e batch -N 2 -n 4 -t simulation -c ``` Other useful arguments include: @@ -60,26 +76,8 @@ Other useful arguments include: - `-a ` to identify the account to be charged for the job. (i.e `--account`) - `-p ` to select the job's partition. (i.e `--partition`) -Since some schedulers don't have a standardized syntax to request certain resources, MFC can only provide support for a restricted subset of common configuration options. -If MFC fails to execute on your system, or if you wish to adjust how the program runs and resources are requested to be allocated, you are invited to modify the template batch script for your queue system. -Upon execution of `./mfc.sh run`, MFC fills in the template with runtime parameters, to generate the batch file it will submit. -These files are located in the [templates](https://github.com/MFlowCode/MFC/tree/master/toolchain/templates/) directory. -To request GPUs, modification of the template will be required on most systems. - -- Lines that begin with `#>` are ignored and won't figure in the final batch script, not even as a comment. - -- Statements of the form `${expression}` are string-replaced to provide runtime parameters, most notably execution options. -You can perform therein any Python operation recognized by the built-in `expr()` function. - As an example, one might request GPUs on a SLURM system using the following: -``` -#SBATCH --gpus=v100-32:{gpus_per_node*nodes} -``` - -- Statements of the form `{MFC::expression}` tell MFC where to place the common code, across all batch files, that is required for proper execution. -They are not intended to be modified by users. - **Disclaimer**: IBM's JSRUN on LSF-managed computers does not use the traditional node-based approach to allocate resources. Therefore, the MFC constructs equivalent resource-sets in task and GPU count. @@ -173,13 +171,6 @@ $ ./mfc.sh run examples/1D_vacuum_restart/restart_case.py -t post_process - Oak Ridge National Laboratory's [Summit](https://www.olcf.ornl.gov/summit/): ```console -$ ./mfc.sh run examples/2D_shockbubble/case.py -e batch \ - -N 2 -n 4 -g 4 -t simulation -a -``` - -- University of California, San Diego's [Expanse](https://www.sdsc.edu/services/hpc/expanse/): - -```console -$ ./mfc.sh run examples/2D_shockbubble/case.py -e batch -p GPU -t simulation \ - -N 2 -n 8 -g 8 -f="--gpus=v100-32:16" -b mpirun –w 00:30:00 +$ ./mfc.sh run examples/2D_shockbubble/case.py -e batch \ + -N 2 -n 4 -t simulation -a -c summit ``` diff --git a/misc/run-phoenix-release-cpu.sh b/misc/run-phoenix-release-cpu.sh index 97b9c7042c..aea1b80a46 100644 --- a/misc/run-phoenix-release-cpu.sh +++ b/misc/run-phoenix-release-cpu.sh @@ -12,5 +12,4 @@ cd "$SLURM_SUBMIT_DIR" echo "Running in $(pwd):" . ./mfc.sh load -c p -m gpu -./mfc.sh test -j $(nproc) -b mpirun -a - +./mfc.sh test -j $(nproc) -a -- -c phoenix diff --git a/misc/run-phoenix-release-gpu.sh b/misc/run-phoenix-release-gpu.sh index 9aa3863cf5..b2f3e4c1f8 100644 --- a/misc/run-phoenix-release-gpu.sh +++ b/misc/run-phoenix-release-gpu.sh @@ -19,4 +19,4 @@ set -x gpu_count=$(nvidia-smi -L | wc -l) # number of GPUs on node gpu_ids=$(seq -s ' ' 0 $(($gpu_count-1))) # 0,1,2,...,gpu_count-1 -./mfc.sh test -a -b mpirun -j 2 --gpu -g $gpu_ids +./mfc.sh test -a -j 2 --gpu -g $gpu_ids -- -c phoenix diff --git a/src/simulation/m_start_up.fpp b/src/simulation/m_start_up.fpp index cd812be585..9c2d5ab2c9 100644 --- a/src/simulation/m_start_up.fpp +++ b/src/simulation/m_start_up.fpp @@ -1147,7 +1147,21 @@ contains call s_assign_default_values_to_user_inputs() call s_read_input_file() call s_check_input_file() - print '(" Simulating a "I0"x"I0"x"I0" case on "I0" rank(s)")', m, n, p, num_procs + + print '(" Simulating a ", A, " ", I0, "x", I0, "x", I0, " case on ", I0, " rank(s) ", A, ".")', & +#:if not MFC_CASE_OPTIMIZATION + "regular", & +#:else + "case-optimized", & +#:endif + m, n, p, num_procs, & +#ifdef MFC_OpenACC +!&< + "with OpenACC offloading" +!&> +#else + "on CPUs" +#endif end if ! Broadcasting the user inputs to all of the processors and performing the diff --git a/tests/02748F0F/README.md b/tests/02748F0F/README.md deleted file mode 100644 index 3e63edbba0..0000000000 --- a/tests/02748F0F/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/02748F0F - -1D -> 1 Fluid(s) -> Viscous -> weno_Re_flux -> weno_avg: [case.py](case.py). diff --git a/tests/043B535A/README.md b/tests/043B535A/README.md deleted file mode 100644 index 4306cd3569..0000000000 --- a/tests/043B535A/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/043B535A - -2D -> 1 Fluid(s) -> riemann_solver=2 -> model_eqns=3: [case.py](case.py). diff --git a/tests/07C33719/README.md b/tests/07C33719/README.md deleted file mode 100644 index 791e2507e3..0000000000 --- a/tests/07C33719/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/07C33719 - -3D -> Cylindrical -> Viscous: [case.py](case.py). diff --git a/tests/07C33719/case.py b/tests/07C33719/case.py deleted file mode 100644 index 20aa542cb6..0000000000 --- a/tests/07C33719/case.py +++ /dev/null @@ -1,176 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/07C33719/case.py: -# 3D -> Cylindrical -> Viscous - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/07C33719/case.py", - description="tests/07C33719/case.py: 3D -> Cylindrical -> Viscous", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 29, - "n": 29, - "p": 29, - "dt": 1e-11, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 2, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.81, - "patch_icpp(1)%alpha(1)": 0.9, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.25, - "patch_icpp(2)%alpha(1)": 0.5, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.08, - "patch_icpp(3)%alpha(1)": 0.2, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 5.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 6.283185307179586, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -14, - "bc_y%end": -3, - "bc_z%beg": -1, - "bc_z%end": -1, - "patch_icpp(1)%geometry": 10, - "patch_icpp(1)%z_centroid": 0.0, - "patch_icpp(1)%length_z": -1000000.0, - "patch_icpp(2)%z_centroid": 0.0, - "patch_icpp(2)%length_z": -1000000.0, - "patch_icpp(3)%z_centroid": 0.0, - "patch_icpp(3)%length_z": -1000000.0, - "patch_icpp(1)%y_centroid": 0.0, - "patch_icpp(1)%length_y": -1000000.0, - "patch_icpp(1)%x_centroid": 0.5, - "patch_icpp(1)%length_x": 1.0, - "patch_icpp(1)%vel(1)": 0.0, - "patch_icpp(1)%vel(2)": 0.0, - "patch_icpp(1)%vel(3)": 0.0, - "patch_icpp(2)%geometry": 10, - "patch_icpp(2)%y_centroid": 0.0, - "patch_icpp(2)%length_y": -1000000.0, - "patch_icpp(2)%x_centroid": 2.5, - "patch_icpp(2)%length_x": 3.0, - "patch_icpp(2)%vel(1)": 0.0, - "patch_icpp(2)%vel(2)": 0.0, - "patch_icpp(2)%vel(3)": 0.0, - "patch_icpp(3)%geometry": 10, - "patch_icpp(3)%y_centroid": 0.0, - "patch_icpp(3)%length_y": -1000000.0, - "patch_icpp(3)%x_centroid": 4.5, - "patch_icpp(3)%length_x": 1.0, - "patch_icpp(3)%vel(1)": 0.0, - "patch_icpp(3)%vel(2)": 0.0, - "patch_icpp(3)%vel(3)": 0.0, - "cyl_coord": "T", - "patch_icpp(1)%radius": 1.0, - "patch_icpp(2)%radius": 1.0, - "patch_icpp(3)%radius": 1.0, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "patch_icpp(1)%alpha_rho(2)": 0.19, - "patch_icpp(1)%alpha(2)": 0.1, - "patch_icpp(2)%alpha_rho(2)": 0.25, - "patch_icpp(2)%alpha(2)": 0.5, - "patch_icpp(3)%alpha_rho(2)": 0.0225, - "patch_icpp(3)%alpha(2)": 0.8, - "fluid_pp(1)%Re(1)": 0.0001, - "fluid_pp(1)%Re(2)": 0.0001, - "fluid_pp(2)%Re(1)": 0.0001, - "fluid_pp(2)%Re(2)": 0.0001, - "weno_Re_flux": "F" -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/0879E062/README.md b/tests/0879E062/README.md deleted file mode 100644 index 5289d061dc..0000000000 --- a/tests/0879E062/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/0879E062 - -1D -> 2 Fluid(s) -> riemann_solver=1 -> avg_state=1: [case.py](case.py). diff --git a/tests/09623DE3/README.md b/tests/09623DE3/README.md deleted file mode 100644 index 9b79393928..0000000000 --- a/tests/09623DE3/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/09623DE3 - -3D -> Cylindrical -> Viscous -> weno_Re_flux -> weno_avg: [case.py](case.py). diff --git a/tests/09623DE3/case.py b/tests/09623DE3/case.py deleted file mode 100644 index 8e009e0955..0000000000 --- a/tests/09623DE3/case.py +++ /dev/null @@ -1,177 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/09623DE3/case.py: -# 3D -> Cylindrical -> Viscous -> weno_Re_flux -> weno_avg - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/09623DE3/case.py", - description="tests/09623DE3/case.py: 3D -> Cylindrical -> Viscous -> weno_Re_flux -> weno_avg", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 29, - "n": 29, - "p": 29, - "dt": 1e-11, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 2, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.81, - "patch_icpp(1)%alpha(1)": 0.9, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.25, - "patch_icpp(2)%alpha(1)": 0.5, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.08, - "patch_icpp(3)%alpha(1)": 0.2, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 5.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 6.283185307179586, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -14, - "bc_y%end": -3, - "bc_z%beg": -1, - "bc_z%end": -1, - "patch_icpp(1)%geometry": 10, - "patch_icpp(1)%z_centroid": 0.0, - "patch_icpp(1)%length_z": -1000000.0, - "patch_icpp(2)%z_centroid": 0.0, - "patch_icpp(2)%length_z": -1000000.0, - "patch_icpp(3)%z_centroid": 0.0, - "patch_icpp(3)%length_z": -1000000.0, - "patch_icpp(1)%y_centroid": 0.0, - "patch_icpp(1)%length_y": -1000000.0, - "patch_icpp(1)%x_centroid": 0.5, - "patch_icpp(1)%length_x": 1.0, - "patch_icpp(1)%vel(1)": 0.0, - "patch_icpp(1)%vel(2)": 0.0, - "patch_icpp(1)%vel(3)": 0.0, - "patch_icpp(2)%geometry": 10, - "patch_icpp(2)%y_centroid": 0.0, - "patch_icpp(2)%length_y": -1000000.0, - "patch_icpp(2)%x_centroid": 2.5, - "patch_icpp(2)%length_x": 3.0, - "patch_icpp(2)%vel(1)": 0.0, - "patch_icpp(2)%vel(2)": 0.0, - "patch_icpp(2)%vel(3)": 0.0, - "patch_icpp(3)%geometry": 10, - "patch_icpp(3)%y_centroid": 0.0, - "patch_icpp(3)%length_y": -1000000.0, - "patch_icpp(3)%x_centroid": 4.5, - "patch_icpp(3)%length_x": 1.0, - "patch_icpp(3)%vel(1)": 0.0, - "patch_icpp(3)%vel(2)": 0.0, - "patch_icpp(3)%vel(3)": 0.0, - "cyl_coord": "T", - "patch_icpp(1)%radius": 1.0, - "patch_icpp(2)%radius": 1.0, - "patch_icpp(3)%radius": 1.0, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "patch_icpp(1)%alpha_rho(2)": 0.19, - "patch_icpp(1)%alpha(2)": 0.1, - "patch_icpp(2)%alpha_rho(2)": 0.25, - "patch_icpp(2)%alpha(2)": 0.5, - "patch_icpp(3)%alpha_rho(2)": 0.0225, - "patch_icpp(3)%alpha(2)": 0.8, - "fluid_pp(1)%Re(1)": 0.0001, - "fluid_pp(1)%Re(2)": 0.0001, - "fluid_pp(2)%Re(1)": 0.0001, - "fluid_pp(2)%Re(2)": 0.0001, - "weno_Re_flux": "T", - "weno_avg": "T" -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/0982571B/README.md b/tests/0982571B/README.md deleted file mode 100644 index d112d224c0..0000000000 --- a/tests/0982571B/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/0982571B - -3D -> Bubbles -> Monopole -> QBMM -> bubble_model=3 -> Non-polytropic: [case.py](case.py). diff --git a/tests/0982571B/case.py b/tests/0982571B/case.py deleted file mode 100644 index 166884967f..0000000000 --- a/tests/0982571B/case.py +++ /dev/null @@ -1,176 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/0982571B/case.py: -# 3D -> Bubbles -> Monopole -> QBMM -> bubble_model=3 -> Non-polytropic - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/0982571B/case.py", - description="tests/0982571B/case.py: 3D -> Bubbles -> Monopole -> QBMM -> bubble_model=3 -> Non-polytropic", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-06, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.96, - "patch_icpp(1)%alpha(1)": 0.04, - "patch_icpp(2)%pres": 1.0, - "patch_icpp(2)%alpha_rho(1)": 0.96, - "patch_icpp(2)%alpha(1)": 0.04, - "patch_icpp(3)%pres": 1.0, - "patch_icpp(3)%alpha_rho(1)": 0.96, - "patch_icpp(3)%alpha(1)": 0.04, - "fluid_pp(1)%gamma": 0.16, - "fluid_pp(1)%pi_inf": 3515.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "T", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "F", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "T", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "T", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "nb": 3, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "fluid_pp(1)%mul0": 0.001002, - "fluid_pp(1)%ss": 0.07275, - "fluid_pp(1)%pv": 2338.8, - "fluid_pp(1)%gamma_v": 1.33, - "fluid_pp(1)%M_v": 18.02, - "fluid_pp(1)%mu_v": 8.816e-06, - "fluid_pp(1)%k_v": 0.019426, - "fluid_pp(2)%gamma_v": 1.4, - "fluid_pp(2)%M_v": 28.97, - "fluid_pp(2)%mu_v": 1.8e-05, - "fluid_pp(2)%k_v": 0.02556, - "Mono(1)%loc(2)": 0.5, - "Mono(1)%loc(3)": 0.5, - "Mono(1)%support": 3 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/09DAFEBA/README.md b/tests/09DAFEBA/README.md deleted file mode 100644 index f43b2533b8..0000000000 --- a/tests/09DAFEBA/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/09DAFEBA - -3D -> bc=-2: [case.py](case.py). diff --git a/tests/0A022883/README.md b/tests/0A022883/README.md deleted file mode 100644 index 696e1076d0..0000000000 --- a/tests/0A022883/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/0A022883 - -3D -> 1 Fluid(s) -> Viscous: [case.py](case.py). diff --git a/tests/0A022883/case.py b/tests/0A022883/case.py deleted file mode 100644 index 15fc4f2ef5..0000000000 --- a/tests/0A022883/case.py +++ /dev/null @@ -1,161 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/0A022883/case.py: -# 3D -> 1 Fluid(s) -> Viscous - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/0A022883/case.py", - description="tests/0A022883/case.py: 3D -> 1 Fluid(s) -> Viscous", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-11, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "patch_icpp(1)%x_centroid": 0.5, - "patch_icpp(1)%length_x": 1, - "patch_icpp(1)%vel(1)": 1.0, - "patch_icpp(1)%vel(2)": 0.0, - "patch_icpp(1)%vel(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(1)%Re(1)": 0.0001, - "weno_Re_flux": "F" -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/0FCCE9F1/README.md b/tests/0FCCE9F1/README.md deleted file mode 100644 index f459e346b4..0000000000 --- a/tests/0FCCE9F1/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/0FCCE9F1 - -1D -> 2 MPI Ranks: [case.py](case.py). diff --git a/tests/122713AA/README.md b/tests/122713AA/README.md deleted file mode 100644 index 2ef98a85f1..0000000000 --- a/tests/122713AA/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/122713AA - -2D -> Hypoelasticity -> 1 Fluid(s): [case.py](case.py). diff --git a/tests/13DFC31D/README.md b/tests/13DFC31D/README.md deleted file mode 100644 index 2e47a08f96..0000000000 --- a/tests/13DFC31D/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/13DFC31D - -3D -> weno_order=3 -> mapped_weno=T -> mp_weno=F: [case.py](case.py). diff --git a/tests/13DFC31D/case.py b/tests/13DFC31D/case.py deleted file mode 100644 index f6c13bfd4f..0000000000 --- a/tests/13DFC31D/case.py +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/13DFC31D/case.py: -# 3D -> weno_order=3 -> mapped_weno=T -> mp_weno=F - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/13DFC31D/case.py", - description="tests/13DFC31D/case.py: 3D -> weno_order=3 -> mapped_weno=T -> mp_weno=F", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 3, - "weno_eps": 1e-16, - "mapped_weno": "T", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/14975B87/README.md b/tests/14975B87/README.md deleted file mode 100644 index 4b1df74479..0000000000 --- a/tests/14975B87/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/14975B87 - -3D -> Viscosity -> Bubbles -> QBMM: [case.py](case.py). diff --git a/tests/14975B87/case.py b/tests/14975B87/case.py deleted file mode 100644 index dca19a6a2e..0000000000 --- a/tests/14975B87/case.py +++ /dev/null @@ -1,174 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/14975B87/case.py: -# 3D -> Viscosity -> Bubbles -> QBMM - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/14975B87/case.py", - description="tests/14975B87/case.py: 3D -> Viscosity -> Bubbles -> QBMM", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-06, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.96, - "patch_icpp(1)%alpha(1)": 0.04, - "patch_icpp(2)%pres": 1.0, - "patch_icpp(2)%alpha_rho(1)": 0.96, - "patch_icpp(2)%alpha(1)": 0.04, - "patch_icpp(3)%pres": 1.0, - "patch_icpp(3)%alpha_rho(1)": 0.96, - "patch_icpp(3)%alpha(1)": 0.04, - "fluid_pp(1)%gamma": 0.16, - "fluid_pp(1)%pi_inf": 3515.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "T", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 2, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "T", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(1)%Re(1)": 50, - "nb": 1, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "fluid_pp(1)%mul0": 0.001002, - "fluid_pp(1)%ss": 0.07275, - "fluid_pp(1)%pv": 2338.8, - "fluid_pp(1)%gamma_v": 1.33, - "fluid_pp(1)%M_v": 18.02, - "fluid_pp(1)%mu_v": 8.816e-06, - "fluid_pp(1)%k_v": 0.019426, - "fluid_pp(2)%gamma_v": 1.4, - "fluid_pp(2)%M_v": 28.97, - "fluid_pp(2)%mu_v": 1.8e-05, - "fluid_pp(2)%k_v": 0.02556 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/14B6198D/README.md b/tests/14B6198D/README.md deleted file mode 100644 index 485bdbc4f0..0000000000 --- a/tests/14B6198D/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/14B6198D - -2D -> Bubbles -> Monopole -> Polytropic -> bubble_model=2: [case.py](case.py). diff --git a/tests/15DBBC68/README.md b/tests/15DBBC68/README.md deleted file mode 100644 index 8fd31fb613..0000000000 --- a/tests/15DBBC68/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/15DBBC68 - -3D -> bc=-14: [case.py](case.py). diff --git a/tests/15DBBC68/case.py b/tests/15DBBC68/case.py deleted file mode 100644 index 60b4352e38..0000000000 --- a/tests/15DBBC68/case.py +++ /dev/null @@ -1,154 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/15DBBC68/case.py: -# 3D -> bc=-14 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/15DBBC68/case.py", - description="tests/15DBBC68/case.py: 3D -> bc=-14", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -14, - "bc_x%end": -14, - "bc_y%beg": -14, - "bc_y%end": -14, - "bc_z%beg": -14, - "bc_z%end": -14, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/16C03D8E/README.md b/tests/16C03D8E/README.md deleted file mode 100644 index 22d4e719c3..0000000000 --- a/tests/16C03D8E/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/16C03D8E - -2D -> bc=-9: [case.py](case.py). diff --git a/tests/16FBF4C8/README.md b/tests/16FBF4C8/README.md deleted file mode 100644 index c3ee6ebee1..0000000000 --- a/tests/16FBF4C8/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/16FBF4C8 - -2D -> 2 Fluid(s) -> riemann_solver=1 -> mixture_err: [case.py](case.py). diff --git a/tests/18431ACB/README.md b/tests/18431ACB/README.md deleted file mode 100644 index ee529cf894..0000000000 --- a/tests/18431ACB/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/18431ACB - -3D -> Phase Change model 5 -> 3 Fluid(s): [case.py](case.py). diff --git a/tests/18431ACB/case.py b/tests/18431ACB/case.py deleted file mode 100644 index ebac14888a..0000000000 --- a/tests/18431ACB/case.py +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/18431ACB/case.py: -# 3D -> Phase Change model 5 -> 3 Fluid(s) - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/18431ACB/case.py", - description="tests/18431ACB/case.py: 3D -> Phase Change model 5 -> 3 Fluid(s)", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-06, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 3, - "alt_soundspeed": "F", - "num_fluids": 3, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 437550.0, - "patch_icpp(1)%alpha_rho(1)": 0.008406131093, - "patch_icpp(1)%alpha(1)": 8.7149e-06, - "patch_icpp(2)%pres": 96602.0, - "patch_icpp(2)%alpha_rho(1)": 0.040265879299999995, - "patch_icpp(2)%alpha(1)": 3.6749e-05, - "patch_icpp(3)%pres": 96602.0, - "patch_icpp(3)%alpha_rho(1)": 0.040265879299999995, - "patch_icpp(3)%alpha(1)": 3.6749e-05, - "fluid_pp(1)%gamma": 0.7409, - "fluid_pp(1)%pi_inf": 1740900000.0, - "fluid_pp(1)%cv": 1816, - "fluid_pp(1)%qv": -1167000, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 606.15, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 10.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 10.0, - "relax": "T", - "relax_model": 5, - "palpha_eps": 0.01, - "ptgalpha_eps": 0.01, - "fluid_pp(2)%gamma": 2.3266, - "fluid_pp(2)%pi_inf": 0.0, - "fluid_pp(2)%cv": 1040, - "fluid_pp(2)%qv": 2030000, - "fluid_pp(2)%qvp": -23400, - "patch_icpp(1)%alpha(2)": 0.025893, - "patch_icpp(1)%alpha_rho(2)": 0.059895687600000004, - "patch_icpp(2)%alpha(2)": 0.028728, - "patch_icpp(2)%alpha_rho(2)": 0.016670858400000002, - "patch_icpp(3)%alpha(2)": 0.028728, - "patch_icpp(3)%alpha_rho(2)": 0.016670858400000002, - "fluid_pp(3)%gamma": 2.487, - "fluid_pp(3)%pi_inf": 0.0, - "fluid_pp(3)%cv": 717.5, - "fluid_pp(3)%qv": 0.0, - "fluid_pp(3)%qvp": 0.0, - "patch_icpp(1)%alpha(3)": 0.9740982851, - "patch_icpp(1)%alpha_rho(3)": 3.4911682537984, - "patch_icpp(2)%alpha(3)": 0.9712352510000001, - "patch_icpp(2)%alpha_rho(3)": 0.8732376141741001, - "patch_icpp(3)%alpha(3)": 0.9712352510000001, - "patch_icpp(3)%alpha_rho(3)": 0.8732376141741001 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/18BDCBC8/README.md b/tests/18BDCBC8/README.md deleted file mode 100644 index e33a7919ab..0000000000 --- a/tests/18BDCBC8/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/18BDCBC8 - -1D -> 1 Fluid(s) -> riemann_solver=2 -> mixture_err: [case.py](case.py). diff --git a/tests/19E33853/README.md b/tests/19E33853/README.md deleted file mode 100644 index 70f67652b4..0000000000 --- a/tests/19E33853/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/19E33853 - -3D -> weno_order=5 -> mapped_weno=T -> mp_weno=F: [case.py](case.py). diff --git a/tests/19E33853/case.py b/tests/19E33853/case.py deleted file mode 100644 index 8a81425db3..0000000000 --- a/tests/19E33853/case.py +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/19E33853/case.py: -# 3D -> weno_order=5 -> mapped_weno=T -> mp_weno=F - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/19E33853/case.py", - description="tests/19E33853/case.py: 3D -> weno_order=5 -> mapped_weno=T -> mp_weno=F", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "T", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/1C0780C8/README.md b/tests/1C0780C8/README.md deleted file mode 100644 index db42945cb8..0000000000 --- a/tests/1C0780C8/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/1C0780C8 - -3D -> 2 Fluid(s) -> Viscous: [case.py](case.py). diff --git a/tests/1C0780C8/case.py b/tests/1C0780C8/case.py deleted file mode 100644 index e856691102..0000000000 --- a/tests/1C0780C8/case.py +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/1C0780C8/case.py: -# 3D -> 2 Fluid(s) -> Viscous - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/1C0780C8/case.py", - description="tests/1C0780C8/case.py: 3D -> 2 Fluid(s) -> Viscous", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-11, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 2, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.81, - "patch_icpp(1)%alpha(1)": 0.9, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.25, - "patch_icpp(2)%alpha(1)": 0.5, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.08, - "patch_icpp(3)%alpha(1)": 0.2, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "patch_icpp(1)%x_centroid": 0.5, - "patch_icpp(1)%length_x": 1, - "patch_icpp(1)%vel(1)": 1.0, - "patch_icpp(1)%vel(2)": 0.0, - "patch_icpp(1)%vel(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "patch_icpp(1)%alpha_rho(2)": 0.19, - "patch_icpp(1)%alpha(2)": 0.1, - "patch_icpp(2)%alpha_rho(2)": 0.25, - "patch_icpp(2)%alpha(2)": 0.5, - "patch_icpp(3)%alpha_rho(2)": 0.0225, - "patch_icpp(3)%alpha(2)": 0.8, - "fluid_pp(1)%Re(1)": 0.001, - "fluid_pp(1)%Re(2)": 0.001, - "fluid_pp(2)%Re(1)": 0.001, - "fluid_pp(2)%Re(2)": 0.001, - "weno_Re_flux": "F" -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/1CCA82F5/README.md b/tests/1CCA82F5/README.md deleted file mode 100644 index 6e40500409..0000000000 --- a/tests/1CCA82F5/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/1CCA82F5 - -1D -> 2 Fluid(s) -> riemann_solver=1 -> mpp_lim: [case.py](case.py). diff --git a/tests/1E738705/README.md b/tests/1E738705/README.md deleted file mode 100644 index 490ac22aad..0000000000 --- a/tests/1E738705/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/1E738705 - -1D -> 2 Fluid(s) -> riemann_solver=1 -> mixture_err: [case.py](case.py). diff --git a/tests/2060F55A/README.md b/tests/2060F55A/README.md deleted file mode 100644 index be14c23020..0000000000 --- a/tests/2060F55A/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/2060F55A - -3D -> 2 Fluid(s) -> Viscous -> weno_Re_flux: [case.py](case.py). diff --git a/tests/2060F55A/case.py b/tests/2060F55A/case.py deleted file mode 100644 index 95ead1f9c4..0000000000 --- a/tests/2060F55A/case.py +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/2060F55A/case.py: -# 3D -> 2 Fluid(s) -> Viscous -> weno_Re_flux - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/2060F55A/case.py", - description="tests/2060F55A/case.py: 3D -> 2 Fluid(s) -> Viscous -> weno_Re_flux", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-11, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 2, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.81, - "patch_icpp(1)%alpha(1)": 0.9, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.25, - "patch_icpp(2)%alpha(1)": 0.5, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.08, - "patch_icpp(3)%alpha(1)": 0.2, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "patch_icpp(1)%x_centroid": 0.5, - "patch_icpp(1)%length_x": 1, - "patch_icpp(1)%vel(1)": 1.0, - "patch_icpp(1)%vel(2)": 0.0, - "patch_icpp(1)%vel(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "patch_icpp(1)%alpha_rho(2)": 0.19, - "patch_icpp(1)%alpha(2)": 0.1, - "patch_icpp(2)%alpha_rho(2)": 0.25, - "patch_icpp(2)%alpha(2)": 0.5, - "patch_icpp(3)%alpha_rho(2)": 0.0225, - "patch_icpp(3)%alpha(2)": 0.8, - "fluid_pp(1)%Re(1)": 0.001, - "fluid_pp(1)%Re(2)": 0.001, - "fluid_pp(2)%Re(1)": 0.001, - "fluid_pp(2)%Re(2)": 0.001, - "weno_Re_flux": "T" -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/20AE0551/README.md b/tests/20AE0551/README.md deleted file mode 100644 index 6ff2678809..0000000000 --- a/tests/20AE0551/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/20AE0551 - -2D -> bc=-4: [case.py](case.py). diff --git a/tests/27A13E25/README.md b/tests/27A13E25/README.md deleted file mode 100644 index 839c1b3875..0000000000 --- a/tests/27A13E25/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/27A13E25 - -2D -> Axisymmetric -> Viscous -> weno_Re_flux -> weno_avg: [case.py](case.py). diff --git a/tests/284E0EF5/README.md b/tests/284E0EF5/README.md deleted file mode 100644 index 4cd62a6ea8..0000000000 --- a/tests/284E0EF5/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/284E0EF5 - -2D -> Viscosity -> Bubbles -> QBMM: [case.py](case.py). diff --git a/tests/2A523AC1/README.md b/tests/2A523AC1/README.md deleted file mode 100644 index 64c11b9bab..0000000000 --- a/tests/2A523AC1/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/2A523AC1 - -3D -> 1 Fluid(s) -> riemann_solver=1 -> wave_speeds=2: [case.py](case.py). diff --git a/tests/2A523AC1/case.py b/tests/2A523AC1/case.py deleted file mode 100644 index 6b22f0e4fc..0000000000 --- a/tests/2A523AC1/case.py +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/2A523AC1/case.py: -# 3D -> 1 Fluid(s) -> riemann_solver=1 -> wave_speeds=2 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/2A523AC1/case.py", - description="tests/2A523AC1/case.py: 3D -> 1 Fluid(s) -> riemann_solver=1 -> wave_speeds=2", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 1, - "wave_speeds": 2, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/2A6136EF/README.md b/tests/2A6136EF/README.md deleted file mode 100644 index 11f76715d3..0000000000 --- a/tests/2A6136EF/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/2A6136EF - -1D -> 2 Fluid(s) -> Viscous -> weno_Re_flux -> weno_avg: [case.py](case.py). diff --git a/tests/2AB32975/README.md b/tests/2AB32975/README.md deleted file mode 100644 index 29150a46c4..0000000000 --- a/tests/2AB32975/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/2AB32975 - -1D -> bc=-3: [case.py](case.py). diff --git a/tests/2E021372/README.md b/tests/2E021372/README.md deleted file mode 100644 index 558b04c3c8..0000000000 --- a/tests/2E021372/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/2E021372 - -2D -> Viscosity -> Bubbles -> Polytropic -> bubble_model=3: [case.py](case.py). diff --git a/tests/2F35A1FE/README.md b/tests/2F35A1FE/README.md deleted file mode 100644 index b8cde19af7..0000000000 --- a/tests/2F35A1FE/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/2F35A1FE - -1D -> 1 Fluid(s) -> riemann_solver=2 -> model_eqns=3: [case.py](case.py). diff --git a/tests/2FD933A2/README.md b/tests/2FD933A2/README.md deleted file mode 100644 index 821793e9de..0000000000 --- a/tests/2FD933A2/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/2FD933A2 - -1D -> bc=-15: [case.py](case.py). diff --git a/tests/301B9153/README.md b/tests/301B9153/README.md deleted file mode 100644 index 2e1cfe8038..0000000000 --- a/tests/301B9153/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/301B9153 - -3D -> Cylindrical -> model_eqns=2: [case.py](case.py). diff --git a/tests/301B9153/case.py b/tests/301B9153/case.py deleted file mode 100644 index 33812e49dc..0000000000 --- a/tests/301B9153/case.py +++ /dev/null @@ -1,171 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/301B9153/case.py: -# 3D -> Cylindrical -> model_eqns=2 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/301B9153/case.py", - description="tests/301B9153/case.py: 3D -> Cylindrical -> model_eqns=2", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 29, - "n": 29, - "p": 29, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 2, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.81, - "patch_icpp(1)%alpha(1)": 0.9, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.25, - "patch_icpp(2)%alpha(1)": 0.5, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.08, - "patch_icpp(3)%alpha(1)": 0.2, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 5.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 6.283185307179586, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -14, - "bc_y%end": -3, - "bc_z%beg": -1, - "bc_z%end": -1, - "patch_icpp(1)%geometry": 10, - "patch_icpp(1)%z_centroid": 0.0, - "patch_icpp(1)%length_z": -1000000.0, - "patch_icpp(2)%z_centroid": 0.0, - "patch_icpp(2)%length_z": -1000000.0, - "patch_icpp(3)%z_centroid": 0.0, - "patch_icpp(3)%length_z": -1000000.0, - "patch_icpp(1)%y_centroid": 0.0, - "patch_icpp(1)%length_y": -1000000.0, - "patch_icpp(1)%x_centroid": 0.5, - "patch_icpp(1)%length_x": 1.0, - "patch_icpp(1)%vel(1)": 0.0, - "patch_icpp(1)%vel(2)": 0.0, - "patch_icpp(1)%vel(3)": 0.0, - "patch_icpp(2)%geometry": 10, - "patch_icpp(2)%y_centroid": 0.0, - "patch_icpp(2)%length_y": -1000000.0, - "patch_icpp(2)%x_centroid": 2.5, - "patch_icpp(2)%length_x": 3.0, - "patch_icpp(2)%vel(1)": 0.0, - "patch_icpp(2)%vel(2)": 0.0, - "patch_icpp(2)%vel(3)": 0.0, - "patch_icpp(3)%geometry": 10, - "patch_icpp(3)%y_centroid": 0.0, - "patch_icpp(3)%length_y": -1000000.0, - "patch_icpp(3)%x_centroid": 4.5, - "patch_icpp(3)%length_x": 1.0, - "patch_icpp(3)%vel(1)": 0.0, - "patch_icpp(3)%vel(2)": 0.0, - "patch_icpp(3)%vel(3)": 0.0, - "cyl_coord": "T", - "patch_icpp(1)%radius": 1.0, - "patch_icpp(2)%radius": 1.0, - "patch_icpp(3)%radius": 1.0, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "patch_icpp(1)%alpha_rho(2)": 0.19, - "patch_icpp(1)%alpha(2)": 0.1, - "patch_icpp(2)%alpha_rho(2)": 0.25, - "patch_icpp(2)%alpha(2)": 0.5, - "patch_icpp(3)%alpha_rho(2)": 0.0225, - "patch_icpp(3)%alpha(2)": 0.8 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/303B925A/README.md b/tests/303B925A/README.md deleted file mode 100644 index 233568ea78..0000000000 --- a/tests/303B925A/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/303B925A - -2D -> Bubbles -> Monopole -> QBMM: [case.py](case.py). diff --git a/tests/32D0F235/README.md b/tests/32D0F235/README.md deleted file mode 100644 index 0ac4674350..0000000000 --- a/tests/32D0F235/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/32D0F235 - -1D -> 1 Fluid(s) -> riemann_solver=1 -> wave_speeds=2: [case.py](case.py). diff --git a/tests/34580912/README.md b/tests/34580912/README.md deleted file mode 100644 index 8761650741..0000000000 --- a/tests/34580912/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/34580912 - -1D -> weno_order=5 -> mapped_weno=F -> mp_weno=T: [case.py](case.py). diff --git a/tests/345A94C0/README.md b/tests/345A94C0/README.md deleted file mode 100644 index dc8da3b9ff..0000000000 --- a/tests/345A94C0/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/345A94C0 - -2D -> 1 Fluid(s) -> riemann_solver=2 -> wave_speeds=2: [case.py](case.py). diff --git a/tests/34DBFE14/README.md b/tests/34DBFE14/README.md deleted file mode 100644 index 95dcc974e8..0000000000 --- a/tests/34DBFE14/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/34DBFE14 - -2D -> Bubbles -> Monopole -> Polytropic -> bubble_model=3: [case.py](case.py). diff --git a/tests/361D2A9B/README.md b/tests/361D2A9B/README.md deleted file mode 100644 index 46b85a9b83..0000000000 --- a/tests/361D2A9B/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/361D2A9B - -2D -> Viscosity -> Bubbles -> bubble_model=2: [case.py](case.py). diff --git a/tests/36256906/README.md b/tests/36256906/README.md deleted file mode 100644 index 26a7adbdc8..0000000000 --- a/tests/36256906/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/36256906 - -3D -> Bubbles -> Monopole -> Polytropic -> bubble_model=3: [case.py](case.py). diff --git a/tests/36256906/case.py b/tests/36256906/case.py deleted file mode 100644 index 5a5d5b0190..0000000000 --- a/tests/36256906/case.py +++ /dev/null @@ -1,176 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/36256906/case.py: -# 3D -> Bubbles -> Monopole -> Polytropic -> bubble_model=3 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/36256906/case.py", - description="tests/36256906/case.py: 3D -> Bubbles -> Monopole -> Polytropic -> bubble_model=3", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-06, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.96, - "patch_icpp(1)%alpha(1)": 0.04, - "patch_icpp(2)%pres": 1.0, - "patch_icpp(2)%alpha_rho(1)": 0.96, - "patch_icpp(2)%alpha(1)": 0.04, - "patch_icpp(3)%pres": 1.0, - "patch_icpp(3)%alpha_rho(1)": 0.96, - "patch_icpp(3)%alpha(1)": 0.04, - "fluid_pp(1)%gamma": 0.16, - "fluid_pp(1)%pi_inf": 3515.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "T", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "T", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "nb": 3, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "fluid_pp(1)%mul0": 0.001002, - "fluid_pp(1)%ss": 0.07275, - "fluid_pp(1)%pv": 2338.8, - "fluid_pp(1)%gamma_v": 1.33, - "fluid_pp(1)%M_v": 18.02, - "fluid_pp(1)%mu_v": 8.816e-06, - "fluid_pp(1)%k_v": 0.019426, - "fluid_pp(2)%gamma_v": 1.4, - "fluid_pp(2)%M_v": 28.97, - "fluid_pp(2)%mu_v": 1.8e-05, - "fluid_pp(2)%k_v": 0.02556, - "Mono(1)%loc(2)": 0.5, - "Mono(1)%loc(3)": 0.5, - "Mono(1)%support": 3 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/38533D07/README.md b/tests/38533D07/README.md deleted file mode 100644 index bdf65260a2..0000000000 --- a/tests/38533D07/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/38533D07 - -3D -> Viscosity -> Bubbles -> Polytropic -> bubble_model=3: [case.py](case.py). diff --git a/tests/38533D07/case.py b/tests/38533D07/case.py deleted file mode 100644 index cdacde696d..0000000000 --- a/tests/38533D07/case.py +++ /dev/null @@ -1,174 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/38533D07/case.py: -# 3D -> Viscosity -> Bubbles -> Polytropic -> bubble_model=3 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/38533D07/case.py", - description="tests/38533D07/case.py: 3D -> Viscosity -> Bubbles -> Polytropic -> bubble_model=3", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-06, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.96, - "patch_icpp(1)%alpha(1)": 0.04, - "patch_icpp(2)%pres": 1.0, - "patch_icpp(2)%alpha_rho(1)": 0.96, - "patch_icpp(2)%alpha(1)": 0.04, - "patch_icpp(3)%pres": 1.0, - "patch_icpp(3)%alpha_rho(1)": 0.96, - "patch_icpp(3)%alpha(1)": 0.04, - "fluid_pp(1)%gamma": 0.16, - "fluid_pp(1)%pi_inf": 3515.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "T", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(1)%Re(1)": 50, - "nb": 1, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "fluid_pp(1)%mul0": 0.001002, - "fluid_pp(1)%ss": 0.07275, - "fluid_pp(1)%pv": 2338.8, - "fluid_pp(1)%gamma_v": 1.33, - "fluid_pp(1)%M_v": 18.02, - "fluid_pp(1)%mu_v": 8.816e-06, - "fluid_pp(1)%k_v": 0.019426, - "fluid_pp(2)%gamma_v": 1.4, - "fluid_pp(2)%M_v": 28.97, - "fluid_pp(2)%mu_v": 1.8e-05, - "fluid_pp(2)%k_v": 0.02556 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/3974AC7B/README.md b/tests/3974AC7B/README.md deleted file mode 100644 index 0dcf69798f..0000000000 --- a/tests/3974AC7B/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/3974AC7B - -2D -> weno_order=5 -> mapped_weno=F -> mp_weno=F: [case.py](case.py). diff --git a/tests/3A8359F6/README.md b/tests/3A8359F6/README.md deleted file mode 100644 index efceaccf74..0000000000 --- a/tests/3A8359F6/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/3A8359F6 - -1D -> 2 Fluid(s) -> riemann_solver=2 -> mixture_err: [case.py](case.py). diff --git a/tests/3AE495F4/README.md b/tests/3AE495F4/README.md deleted file mode 100644 index 7da9a14fc1..0000000000 --- a/tests/3AE495F4/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/3AE495F4 - -1D -> bc=-5: [case.py](case.py). diff --git a/tests/3B414AF0/README.md b/tests/3B414AF0/README.md deleted file mode 100644 index ebd2a076c6..0000000000 --- a/tests/3B414AF0/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/3B414AF0 - -2D -> 1 Fluid(s) -> riemann_solver=2 -> mixture_err: [case.py](case.py). diff --git a/tests/3BFEAC19/README.md b/tests/3BFEAC19/README.md deleted file mode 100644 index e5b31b8ee6..0000000000 --- a/tests/3BFEAC19/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/3BFEAC19 - -2D -> 1 Fluid(s) -> riemann_solver=1 -> avg_state=1: [case.py](case.py). diff --git a/tests/3C00B89D/README.md b/tests/3C00B89D/README.md deleted file mode 100644 index 4dcbba2fbc..0000000000 --- a/tests/3C00B89D/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/3C00B89D - -2D -> 1 Fluid(s) -> riemann_solver=2 -> avg_state=1: [case.py](case.py). diff --git a/tests/3FC6FC4A/README.md b/tests/3FC6FC4A/README.md deleted file mode 100644 index 41223077cd..0000000000 --- a/tests/3FC6FC4A/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/3FC6FC4A - -1D -> bc=-12: [case.py](case.py). diff --git a/tests/4129A23A/README.md b/tests/4129A23A/README.md deleted file mode 100644 index 5955fba927..0000000000 --- a/tests/4129A23A/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/4129A23A - -2D -> bc=-6: [case.py](case.py). diff --git a/tests/42B169F5/README.md b/tests/42B169F5/README.md deleted file mode 100644 index 465eab75a8..0000000000 --- a/tests/42B169F5/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/42B169F5 - -3D -> weno_order=5 -> mapped_weno=F -> mp_weno=T: [case.py](case.py). diff --git a/tests/42B169F5/case.py b/tests/42B169F5/case.py deleted file mode 100644 index 896783b63c..0000000000 --- a/tests/42B169F5/case.py +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/42B169F5/case.py: -# 3D -> weno_order=5 -> mapped_weno=F -> mp_weno=T - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/42B169F5/case.py", - description="tests/42B169F5/case.py: 3D -> weno_order=5 -> mapped_weno=F -> mp_weno=T", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "T", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/461DCB09/README.md b/tests/461DCB09/README.md deleted file mode 100644 index 3352bde038..0000000000 --- a/tests/461DCB09/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/461DCB09 - -1D -> 2 Fluid(s) -> riemann_solver=2 -> wave_speeds=2: [case.py](case.py). diff --git a/tests/46AA7AF8/README.md b/tests/46AA7AF8/README.md deleted file mode 100644 index d8abfe9d22..0000000000 --- a/tests/46AA7AF8/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/46AA7AF8 - -1D -> Bubbles -> Monopole -> QBMM: [case.py](case.py). diff --git a/tests/48B9D0C4/README.md b/tests/48B9D0C4/README.md deleted file mode 100644 index a1315cd711..0000000000 --- a/tests/48B9D0C4/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/48B9D0C4 - -3D -> Viscosity -> Bubbles -> QBMM -> bubble_model=3: [case.py](case.py). diff --git a/tests/48B9D0C4/case.py b/tests/48B9D0C4/case.py deleted file mode 100644 index e1c1b845c5..0000000000 --- a/tests/48B9D0C4/case.py +++ /dev/null @@ -1,174 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/48B9D0C4/case.py: -# 3D -> Viscosity -> Bubbles -> QBMM -> bubble_model=3 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/48B9D0C4/case.py", - description="tests/48B9D0C4/case.py: 3D -> Viscosity -> Bubbles -> QBMM -> bubble_model=3", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-06, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.96, - "patch_icpp(1)%alpha(1)": 0.04, - "patch_icpp(2)%pres": 1.0, - "patch_icpp(2)%alpha_rho(1)": 0.96, - "patch_icpp(2)%alpha(1)": 0.04, - "patch_icpp(3)%pres": 1.0, - "patch_icpp(3)%alpha_rho(1)": 0.96, - "patch_icpp(3)%alpha(1)": 0.04, - "fluid_pp(1)%gamma": 0.16, - "fluid_pp(1)%pi_inf": 3515.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "T", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "T", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(1)%Re(1)": 50, - "nb": 1, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "fluid_pp(1)%mul0": 0.001002, - "fluid_pp(1)%ss": 0.07275, - "fluid_pp(1)%pv": 2338.8, - "fluid_pp(1)%gamma_v": 1.33, - "fluid_pp(1)%M_v": 18.02, - "fluid_pp(1)%mu_v": 8.816e-06, - "fluid_pp(1)%k_v": 0.019426, - "fluid_pp(2)%gamma_v": 1.4, - "fluid_pp(2)%M_v": 28.97, - "fluid_pp(2)%mu_v": 1.8e-05, - "fluid_pp(2)%k_v": 0.02556 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/48CCE072/README.md b/tests/48CCE072/README.md deleted file mode 100644 index 8e0357b780..0000000000 --- a/tests/48CCE072/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/48CCE072 - -1D -> bc=-7: [case.py](case.py). diff --git a/tests/4AEF478A/README.md b/tests/4AEF478A/README.md deleted file mode 100644 index b8f72f4006..0000000000 --- a/tests/4AEF478A/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/4AEF478A - -1D -> 1 Fluid(s) -> riemann_solver=1 -> avg_state=1: [case.py](case.py). diff --git a/tests/4D7926CD/README.md b/tests/4D7926CD/README.md deleted file mode 100644 index b7f78a75d1..0000000000 --- a/tests/4D7926CD/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/4D7926CD - -2D -> bc=-15: [case.py](case.py). diff --git a/tests/4F2F4ACE/README.md b/tests/4F2F4ACE/README.md deleted file mode 100644 index 78be2d5b50..0000000000 --- a/tests/4F2F4ACE/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/4F2F4ACE - -2D -> 2 Fluid(s) -> riemann_solver=2 -> model_eqns=3: [case.py](case.py). diff --git a/tests/4FC44FAE/README.md b/tests/4FC44FAE/README.md deleted file mode 100644 index 2bc3b1e2e9..0000000000 --- a/tests/4FC44FAE/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/4FC44FAE - -1D -> bc=-14: [case.py](case.py). diff --git a/tests/4FC44FAE/case.py b/tests/4FC44FAE/case.py deleted file mode 100644 index bc224945ae..0000000000 --- a/tests/4FC44FAE/case.py +++ /dev/null @@ -1,130 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/4FC44FAE/case.py: -# 1D -> bc=-14 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/4FC44FAE/case.py", - description="tests/4FC44FAE/case.py: 1D -> bc=-14", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 299, - "n": 0, - "p": 0, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "bc_x%beg": -14, - "bc_x%end": -14, - "patch_icpp(1)%geometry": 1, - "patch_icpp(1)%x_centroid": 0.05, - "patch_icpp(1)%length_x": 0.1, - "patch_icpp(2)%x_centroid": 0.45, - "patch_icpp(2)%length_x": 0.7, - "patch_icpp(3)%x_centroid": 0.9, - "patch_icpp(3)%length_x": 0.2, - "patch_icpp(1)%vel(1)": 0.0, - "patch_icpp(2)%geometry": 1, - "patch_icpp(2)%vel(1)": 0.0, - "patch_icpp(3)%geometry": 1, - "patch_icpp(3)%vel(1)": 0.0 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/5010B814/README.md b/tests/5010B814/README.md deleted file mode 100644 index 13afbba746..0000000000 --- a/tests/5010B814/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/5010B814 - -3D -> bc=-6: [case.py](case.py). diff --git a/tests/50A8B1FE/README.md b/tests/50A8B1FE/README.md deleted file mode 100644 index bd5e4fbf08..0000000000 --- a/tests/50A8B1FE/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/50A8B1FE - -1D -> Bubbles -> Monopole -> QBMM -> Non-polytropic: [case.py](case.py). diff --git a/tests/5281BD7B/README.md b/tests/5281BD7B/README.md deleted file mode 100644 index 2c2b8a0a17..0000000000 --- a/tests/5281BD7B/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/5281BD7B - -2D -> Hypoelasticity -> 2 Fluid(s): [case.py](case.py). diff --git a/tests/53E13D19/README.md b/tests/53E13D19/README.md deleted file mode 100644 index 691ccd6b6b..0000000000 --- a/tests/53E13D19/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/53E13D19 - -1D -> Viscosity -> Bubbles -> QBMM -> bubble_model=3: [case.py](case.py). diff --git a/tests/541A30DB/README.md b/tests/541A30DB/README.md deleted file mode 100644 index 319447a946..0000000000 --- a/tests/541A30DB/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/541A30DB - -3D -> Viscosity -> Bubbles -> bubble_model=2: [case.py](case.py). diff --git a/tests/541A30DB/case.py b/tests/541A30DB/case.py deleted file mode 100644 index 10e581cb7a..0000000000 --- a/tests/541A30DB/case.py +++ /dev/null @@ -1,174 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/541A30DB/case.py: -# 3D -> Viscosity -> Bubbles -> bubble_model=2 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/541A30DB/case.py", - description="tests/541A30DB/case.py: 3D -> Viscosity -> Bubbles -> bubble_model=2", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-06, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.96, - "patch_icpp(1)%alpha(1)": 0.04, - "patch_icpp(2)%pres": 1.0, - "patch_icpp(2)%alpha_rho(1)": 0.96, - "patch_icpp(2)%alpha(1)": 0.04, - "patch_icpp(3)%pres": 1.0, - "patch_icpp(3)%alpha_rho(1)": 0.96, - "patch_icpp(3)%alpha(1)": 0.04, - "fluid_pp(1)%gamma": 0.16, - "fluid_pp(1)%pi_inf": 3515.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "T", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 2, - "polytropic": "F", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(1)%Re(1)": 50, - "nb": 1, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "fluid_pp(1)%mul0": 0.001002, - "fluid_pp(1)%ss": 0.07275, - "fluid_pp(1)%pv": 2338.8, - "fluid_pp(1)%gamma_v": 1.33, - "fluid_pp(1)%M_v": 18.02, - "fluid_pp(1)%mu_v": 8.816e-06, - "fluid_pp(1)%k_v": 0.019426, - "fluid_pp(2)%gamma_v": 1.4, - "fluid_pp(2)%M_v": 28.97, - "fluid_pp(2)%mu_v": 1.8e-05, - "fluid_pp(2)%k_v": 0.02556 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/5527832F/README.md b/tests/5527832F/README.md deleted file mode 100644 index bf1dfd5926..0000000000 --- a/tests/5527832F/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/5527832F - -1D -> 1 Fluid(s) -> riemann_solver=1 -> mixture_err: [case.py](case.py). diff --git a/tests/55533234/README.md b/tests/55533234/README.md deleted file mode 100644 index 34c69b3a0d..0000000000 --- a/tests/55533234/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/55533234 - -2D -> bc=-1: [case.py](case.py). diff --git a/tests/557FF170/README.md b/tests/557FF170/README.md deleted file mode 100644 index a2da9a1e3d..0000000000 --- a/tests/557FF170/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/557FF170 - -3D -> bc=-11: [case.py](case.py). diff --git a/tests/5781A4C2/README.md b/tests/5781A4C2/README.md deleted file mode 100644 index ca01598ec7..0000000000 --- a/tests/5781A4C2/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/5781A4C2 - -2D -> 2 Fluid(s) -> riemann_solver=2 -> mixture_err: [case.py](case.py). diff --git a/tests/59B127EF/README.md b/tests/59B127EF/README.md deleted file mode 100644 index fb8332adb8..0000000000 --- a/tests/59B127EF/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/59B127EF - -2D -> 1 Fluid(s) -> Viscous -> weno_Re_flux -> weno_avg: [case.py](case.py). diff --git a/tests/59D05DE9/README.md b/tests/59D05DE9/README.md deleted file mode 100644 index 673e8e3a12..0000000000 --- a/tests/59D05DE9/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/59D05DE9 - -1D -> Bubbles -> Monopole -> nb=1: [case.py](case.py). diff --git a/tests/5DAB50B2/README.md b/tests/5DAB50B2/README.md deleted file mode 100644 index b2ef551ecd..0000000000 --- a/tests/5DAB50B2/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/5DAB50B2 - -2D -> 2 Fluid(s) -> riemann_solver=2 -> alt_soundspeed: [case.py](case.py). diff --git a/tests/5E2265C4/README.md b/tests/5E2265C4/README.md deleted file mode 100644 index 6f5d910f16..0000000000 --- a/tests/5E2265C4/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/5E2265C4 - -1D -> Viscosity -> Bubbles -> Polytropic -> bubble_model=3: [case.py](case.py). diff --git a/tests/5E454E32/README.md b/tests/5E454E32/README.md deleted file mode 100644 index a4eb18c759..0000000000 --- a/tests/5E454E32/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/5E454E32 - -2D -> 2 Fluid(s) -> Viscous -> weno_Re_flux -> weno_avg: [case.py](case.py). diff --git a/tests/5EC236F2/README.md b/tests/5EC236F2/README.md deleted file mode 100644 index ae63899695..0000000000 --- a/tests/5EC236F2/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/5EC236F2 - -1D -> bc=-6: [case.py](case.py). diff --git a/tests/5F877BC9/README.md b/tests/5F877BC9/README.md deleted file mode 100644 index 2dc083de60..0000000000 --- a/tests/5F877BC9/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/5F877BC9 - -2D -> bc=-8: [case.py](case.py). diff --git a/tests/61FFF3D3/README.md b/tests/61FFF3D3/README.md deleted file mode 100644 index da05a52043..0000000000 --- a/tests/61FFF3D3/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/61FFF3D3 - -3D -> bc=-12: [case.py](case.py). diff --git a/tests/622DEC78/README.md b/tests/622DEC78/README.md deleted file mode 100644 index c72f96c1e7..0000000000 --- a/tests/622DEC78/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/622DEC78 - -3D -> Bubbles -> Monopole -> bubble_model=2: [case.py](case.py). diff --git a/tests/622DEC78/case.py b/tests/622DEC78/case.py deleted file mode 100644 index 5b8316ea9e..0000000000 --- a/tests/622DEC78/case.py +++ /dev/null @@ -1,176 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/622DEC78/case.py: -# 3D -> Bubbles -> Monopole -> bubble_model=2 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/622DEC78/case.py", - description="tests/622DEC78/case.py: 3D -> Bubbles -> Monopole -> bubble_model=2", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-06, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.96, - "patch_icpp(1)%alpha(1)": 0.04, - "patch_icpp(2)%pres": 1.0, - "patch_icpp(2)%alpha_rho(1)": 0.96, - "patch_icpp(2)%alpha(1)": 0.04, - "patch_icpp(3)%pres": 1.0, - "patch_icpp(3)%alpha_rho(1)": 0.96, - "patch_icpp(3)%alpha(1)": 0.04, - "fluid_pp(1)%gamma": 0.16, - "fluid_pp(1)%pi_inf": 3515.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "T", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 2, - "polytropic": "F", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "T", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "nb": 3, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "fluid_pp(1)%mul0": 0.001002, - "fluid_pp(1)%ss": 0.07275, - "fluid_pp(1)%pv": 2338.8, - "fluid_pp(1)%gamma_v": 1.33, - "fluid_pp(1)%M_v": 18.02, - "fluid_pp(1)%mu_v": 8.816e-06, - "fluid_pp(1)%k_v": 0.019426, - "fluid_pp(2)%gamma_v": 1.4, - "fluid_pp(2)%M_v": 28.97, - "fluid_pp(2)%mu_v": 1.8e-05, - "fluid_pp(2)%k_v": 0.02556, - "Mono(1)%loc(2)": 0.5, - "Mono(1)%loc(3)": 0.5, - "Mono(1)%support": 3 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/6241177B/README.md b/tests/6241177B/README.md deleted file mode 100644 index 3488c56d3d..0000000000 --- a/tests/6241177B/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/6241177B - -3D -> 1 Fluid(s) -> riemann_solver=2 -> model_eqns=3: [case.py](case.py). diff --git a/tests/6241177B/case.py b/tests/6241177B/case.py deleted file mode 100644 index 0e09e41031..0000000000 --- a/tests/6241177B/case.py +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/6241177B/case.py: -# 3D -> 1 Fluid(s) -> riemann_solver=2 -> model_eqns=3 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/6241177B/case.py", - description="tests/6241177B/case.py: 3D -> 1 Fluid(s) -> riemann_solver=2 -> model_eqns=3", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 3, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/6249EDDE/README.md b/tests/6249EDDE/README.md deleted file mode 100644 index c4f3cf2d76..0000000000 --- a/tests/6249EDDE/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/6249EDDE - -3D -> bc=-15: [case.py](case.py). diff --git a/tests/6249EDDE/case.py b/tests/6249EDDE/case.py deleted file mode 100644 index 3e694f86fb..0000000000 --- a/tests/6249EDDE/case.py +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/6249EDDE/case.py: -# 3D -> bc=-15 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/6249EDDE/case.py", - description="tests/6249EDDE/case.py: 3D -> bc=-15", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -15, - "bc_x%end": -15, - "bc_y%beg": -15, - "bc_y%end": -15, - "bc_z%beg": -15, - "bc_z%end": -15, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/63850240/README.md b/tests/63850240/README.md deleted file mode 100644 index d9c49ff059..0000000000 --- a/tests/63850240/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/63850240 - -3D -> Bubbles -> Monopole -> QBMM -> bubble_model=3: [case.py](case.py). diff --git a/tests/63850240/case.py b/tests/63850240/case.py deleted file mode 100644 index 10f73b6c8c..0000000000 --- a/tests/63850240/case.py +++ /dev/null @@ -1,176 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/63850240/case.py: -# 3D -> Bubbles -> Monopole -> QBMM -> bubble_model=3 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/63850240/case.py", - description="tests/63850240/case.py: 3D -> Bubbles -> Monopole -> QBMM -> bubble_model=3", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-06, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.96, - "patch_icpp(1)%alpha(1)": 0.04, - "patch_icpp(2)%pres": 1.0, - "patch_icpp(2)%alpha_rho(1)": 0.96, - "patch_icpp(2)%alpha(1)": 0.04, - "patch_icpp(3)%pres": 1.0, - "patch_icpp(3)%alpha_rho(1)": 0.96, - "patch_icpp(3)%alpha(1)": 0.04, - "fluid_pp(1)%gamma": 0.16, - "fluid_pp(1)%pi_inf": 3515.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "T", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "T", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "T", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "nb": 3, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "fluid_pp(1)%mul0": 0.001002, - "fluid_pp(1)%ss": 0.07275, - "fluid_pp(1)%pv": 2338.8, - "fluid_pp(1)%gamma_v": 1.33, - "fluid_pp(1)%M_v": 18.02, - "fluid_pp(1)%mu_v": 8.816e-06, - "fluid_pp(1)%k_v": 0.019426, - "fluid_pp(2)%gamma_v": 1.4, - "fluid_pp(2)%M_v": 28.97, - "fluid_pp(2)%mu_v": 1.8e-05, - "fluid_pp(2)%k_v": 0.02556, - "Mono(1)%loc(2)": 0.5, - "Mono(1)%loc(3)": 0.5, - "Mono(1)%support": 3 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/645A26E3/README.md b/tests/645A26E3/README.md deleted file mode 100644 index 751bfdef7a..0000000000 --- a/tests/645A26E3/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/645A26E3 - -2D -> 2 Fluid(s) -> riemann_solver=2 -> avg_state=1: [case.py](case.py). diff --git a/tests/64E032D7/README.md b/tests/64E032D7/README.md deleted file mode 100644 index 8eba51b96d..0000000000 --- a/tests/64E032D7/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/64E032D7 - -3D -> 1 Fluid(s) -> Viscous -> weno_Re_flux: [case.py](case.py). diff --git a/tests/64E032D7/case.py b/tests/64E032D7/case.py deleted file mode 100644 index 9faa424c0a..0000000000 --- a/tests/64E032D7/case.py +++ /dev/null @@ -1,161 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/64E032D7/case.py: -# 3D -> 1 Fluid(s) -> Viscous -> weno_Re_flux - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/64E032D7/case.py", - description="tests/64E032D7/case.py: 3D -> 1 Fluid(s) -> Viscous -> weno_Re_flux", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-11, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "patch_icpp(1)%x_centroid": 0.5, - "patch_icpp(1)%length_x": 1, - "patch_icpp(1)%vel(1)": 1.0, - "patch_icpp(1)%vel(2)": 0.0, - "patch_icpp(1)%vel(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(1)%Re(1)": 0.0001, - "weno_Re_flux": "T" -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/66CFF8CC/README.md b/tests/66CFF8CC/README.md deleted file mode 100644 index a5b7226bfd..0000000000 --- a/tests/66CFF8CC/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/66CFF8CC - -2D -> Bubbles -> Monopole -> QBMM -> bubble_model=3: [case.py](case.py). diff --git a/tests/6784C02E/README.md b/tests/6784C02E/README.md deleted file mode 100644 index e524a7fc98..0000000000 --- a/tests/6784C02E/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/6784C02E - -1D -> Viscosity -> Bubbles -> QBMM: [case.py](case.py). diff --git a/tests/6B22A317/README.md b/tests/6B22A317/README.md deleted file mode 100644 index 7aa016f4b7..0000000000 --- a/tests/6B22A317/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/6B22A317 - -1D -> Bubbles -> Monopole -> bubble_model=2: [case.py](case.py). diff --git a/tests/6B4B738B/README.md b/tests/6B4B738B/README.md deleted file mode 100644 index f25fdd4395..0000000000 --- a/tests/6B4B738B/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/6B4B738B - -3D -> bc=-3: [case.py](case.py). diff --git a/tests/6B4B738B/case.py b/tests/6B4B738B/case.py deleted file mode 100644 index 1a7ed9161a..0000000000 --- a/tests/6B4B738B/case.py +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/6B4B738B/case.py: -# 3D -> bc=-3 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/6B4B738B/case.py", - description="tests/6B4B738B/case.py: 3D -> bc=-3", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/6D24B115/README.md b/tests/6D24B115/README.md deleted file mode 100644 index c1b9286232..0000000000 --- a/tests/6D24B115/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/6D24B115 - -1D -> 2 Fluid(s) -> riemann_solver=2 -> avg_state=1: [case.py](case.py). diff --git a/tests/6F296065/README.md b/tests/6F296065/README.md deleted file mode 100644 index fd94120f9e..0000000000 --- a/tests/6F296065/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/6F296065 - -2D -> Phase Change model 5 -> 3 Fluid(s): [case.py](case.py). diff --git a/tests/6FC6A809/README.md b/tests/6FC6A809/README.md deleted file mode 100644 index 01ac600a4f..0000000000 --- a/tests/6FC6A809/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/6FC6A809 - -3D -> bc=-1: [case.py](case.py). diff --git a/tests/7077C99F/README.md b/tests/7077C99F/README.md deleted file mode 100644 index 8ce7e46f2c..0000000000 --- a/tests/7077C99F/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/7077C99F - -1D -> weno_order=3 -> mapped_weno=T -> mp_weno=F: [case.py](case.py). diff --git a/tests/70DAE9E8/README.md b/tests/70DAE9E8/README.md deleted file mode 100644 index 11b8926146..0000000000 --- a/tests/70DAE9E8/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/70DAE9E8 - -1D -> bc=-4: [case.py](case.py). diff --git a/tests/727F72ED/README.md b/tests/727F72ED/README.md deleted file mode 100644 index 4288867400..0000000000 --- a/tests/727F72ED/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/727F72ED - -1D -> bc=-10: [case.py](case.py). diff --git a/tests/728A2A5B/README.md b/tests/728A2A5B/README.md deleted file mode 100644 index 4887664851..0000000000 --- a/tests/728A2A5B/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/728A2A5B - -3D -> weno_order=5 -> mapped_weno=F -> mp_weno=F: [case.py](case.py). diff --git a/tests/728A2A5B/case.py b/tests/728A2A5B/case.py deleted file mode 100644 index db49a3e43b..0000000000 --- a/tests/728A2A5B/case.py +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/728A2A5B/case.py: -# 3D -> weno_order=5 -> mapped_weno=F -> mp_weno=F - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/728A2A5B/case.py", - description="tests/728A2A5B/case.py: 3D -> weno_order=5 -> mapped_weno=F -> mp_weno=F", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/729A4333/README.md b/tests/729A4333/README.md deleted file mode 100644 index 278fdd89dc..0000000000 --- a/tests/729A4333/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/729A4333 - -1D -> Viscosity -> Bubbles -> nb=1: [case.py](case.py). diff --git a/tests/72FD6FF5/README.md b/tests/72FD6FF5/README.md deleted file mode 100644 index 71cf87c265..0000000000 --- a/tests/72FD6FF5/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/72FD6FF5 - -3D -> Phase Change model 5 -> 2 Fluid(s): [case.py](case.py). diff --git a/tests/72FD6FF5/case.py b/tests/72FD6FF5/case.py deleted file mode 100644 index 630df15a6f..0000000000 --- a/tests/72FD6FF5/case.py +++ /dev/null @@ -1,174 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/72FD6FF5/case.py: -# 3D -> Phase Change model 5 -> 2 Fluid(s) - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/72FD6FF5/case.py", - description="tests/72FD6FF5/case.py: 3D -> Phase Change model 5 -> 2 Fluid(s)", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-06, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 3, - "alt_soundspeed": "F", - "num_fluids": 2, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 437550.0, - "patch_icpp(1)%alpha_rho(1)": 0.008406131093, - "patch_icpp(1)%alpha(1)": 8.7149e-06, - "patch_icpp(2)%pres": 96602.0, - "patch_icpp(2)%alpha_rho(1)": 0.040265879299999995, - "patch_icpp(2)%alpha(1)": 3.6749e-05, - "patch_icpp(3)%pres": 96602.0, - "patch_icpp(3)%alpha_rho(1)": 0.040265879299999995, - "patch_icpp(3)%alpha(1)": 3.6749e-05, - "fluid_pp(1)%gamma": 0.7409, - "fluid_pp(1)%pi_inf": 1740900000.0, - "fluid_pp(1)%cv": 1816, - "fluid_pp(1)%qv": -1167000, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 606.15, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 10.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 10.0, - "relax": "T", - "relax_model": 5, - "palpha_eps": 0.01, - "ptgalpha_eps": 0.01, - "fluid_pp(2)%gamma": 2.3266, - "fluid_pp(2)%pi_inf": 0.0, - "fluid_pp(2)%cv": 1040, - "fluid_pp(2)%qv": 2030000, - "fluid_pp(2)%qvp": -23400, - "patch_icpp(1)%alpha(2)": 0.9999912851, - "patch_icpp(1)%alpha_rho(2)": 2.31317984069332, - "patch_icpp(2)%alpha(2)": 0.999963251, - "patch_icpp(2)%alpha_rho(2)": 0.5802786745553, - "patch_icpp(3)%alpha(2)": 0.999963251, - "patch_icpp(3)%alpha_rho(2)": 0.5802786745553 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/730DFD6D/README.md b/tests/730DFD6D/README.md deleted file mode 100644 index e073c05aee..0000000000 --- a/tests/730DFD6D/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/730DFD6D - -3D -> bc=-7: [case.py](case.py). diff --git a/tests/7374E266/README.md b/tests/7374E266/README.md deleted file mode 100644 index 1cdaa38da0..0000000000 --- a/tests/7374E266/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/7374E266 - -2D -> 1 Fluid(s) -> riemann_solver=1 -> mixture_err: [case.py](case.py). diff --git a/tests/73B0539E/README.md b/tests/73B0539E/README.md deleted file mode 100644 index dcd80786d8..0000000000 --- a/tests/73B0539E/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/73B0539E - -3D -> 1 Fluid(s) -> riemann_solver=1 -> avg_state=1: [case.py](case.py). diff --git a/tests/73B0539E/case.py b/tests/73B0539E/case.py deleted file mode 100644 index a6f1e685c6..0000000000 --- a/tests/73B0539E/case.py +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/73B0539E/case.py: -# 3D -> 1 Fluid(s) -> riemann_solver=1 -> avg_state=1 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/73B0539E/case.py", - description="tests/73B0539E/case.py: 3D -> 1 Fluid(s) -> riemann_solver=1 -> avg_state=1", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 1, - "wave_speeds": 1, - "avg_state": 1, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/758D0268/README.md b/tests/758D0268/README.md deleted file mode 100644 index 19f31f26b3..0000000000 --- a/tests/758D0268/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/758D0268 - -3D -> 2 Fluid(s) -> riemann_solver=1 -> mpp_lim: [case.py](case.py). diff --git a/tests/758D0268/case.py b/tests/758D0268/case.py deleted file mode 100644 index 2b8d33ec97..0000000000 --- a/tests/758D0268/case.py +++ /dev/null @@ -1,167 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/758D0268/case.py: -# 3D -> 2 Fluid(s) -> riemann_solver=1 -> mpp_lim - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/758D0268/case.py", - description="tests/758D0268/case.py: 3D -> 2 Fluid(s) -> riemann_solver=1 -> mpp_lim", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 2, - "adv_alphan": "T", - "mpp_lim": "T", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 1, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.81, - "patch_icpp(1)%alpha(1)": 0.9, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.25, - "patch_icpp(2)%alpha(1)": 0.5, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.08, - "patch_icpp(3)%alpha(1)": 0.2, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "patch_icpp(1)%alpha_rho(2)": 0.19, - "patch_icpp(1)%alpha(2)": 0.1, - "patch_icpp(2)%alpha_rho(2)": 0.25, - "patch_icpp(2)%alpha(2)": 0.5, - "patch_icpp(3)%alpha_rho(2)": 0.0225, - "patch_icpp(3)%alpha(2)": 0.8 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/786DE444/README.md b/tests/786DE444/README.md deleted file mode 100644 index bbe597787d..0000000000 --- a/tests/786DE444/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/786DE444 - -1D -> Phase Change model 6 -> 3 Fluid(s): [case.py](case.py). diff --git a/tests/7C8F1BA9/README.md b/tests/7C8F1BA9/README.md deleted file mode 100644 index 7f12306e42..0000000000 --- a/tests/7C8F1BA9/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/7C8F1BA9 - -3D -> 2 Fluid(s) -> riemann_solver=2 -> alt_soundspeed: [case.py](case.py). diff --git a/tests/7C8F1BA9/case.py b/tests/7C8F1BA9/case.py deleted file mode 100644 index 3755342822..0000000000 --- a/tests/7C8F1BA9/case.py +++ /dev/null @@ -1,167 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/7C8F1BA9/case.py: -# 3D -> 2 Fluid(s) -> riemann_solver=2 -> alt_soundspeed - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/7C8F1BA9/case.py", - description="tests/7C8F1BA9/case.py: 3D -> 2 Fluid(s) -> riemann_solver=2 -> alt_soundspeed", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "T", - "num_fluids": 2, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.81, - "patch_icpp(1)%alpha(1)": 0.9, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.25, - "patch_icpp(2)%alpha(1)": 0.5, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.08, - "patch_icpp(3)%alpha(1)": 0.2, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "patch_icpp(1)%alpha_rho(2)": 0.19, - "patch_icpp(1)%alpha(2)": 0.1, - "patch_icpp(2)%alpha_rho(2)": 0.25, - "patch_icpp(2)%alpha(2)": 0.5, - "patch_icpp(3)%alpha_rho(2)": 0.0225, - "patch_icpp(3)%alpha(2)": 0.8 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/7DEA8C54/README.md b/tests/7DEA8C54/README.md deleted file mode 100644 index 1387f8539f..0000000000 --- a/tests/7DEA8C54/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/7DEA8C54 - -3D -> 1 Fluid(s) -> Viscous -> weno_Re_flux -> weno_avg: [case.py](case.py). diff --git a/tests/7DEA8C54/case.py b/tests/7DEA8C54/case.py deleted file mode 100644 index ca6d2d517d..0000000000 --- a/tests/7DEA8C54/case.py +++ /dev/null @@ -1,162 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/7DEA8C54/case.py: -# 3D -> 1 Fluid(s) -> Viscous -> weno_Re_flux -> weno_avg - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/7DEA8C54/case.py", - description="tests/7DEA8C54/case.py: 3D -> 1 Fluid(s) -> Viscous -> weno_Re_flux -> weno_avg", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-11, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "patch_icpp(1)%x_centroid": 0.5, - "patch_icpp(1)%length_x": 1, - "patch_icpp(1)%vel(1)": 1.0, - "patch_icpp(1)%vel(2)": 0.0, - "patch_icpp(1)%vel(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(1)%Re(1)": 0.0001, - "weno_Re_flux": "T", - "weno_avg": "T" -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/7EFBCDAE/README.md b/tests/7EFBCDAE/README.md deleted file mode 100644 index d101c7961b..0000000000 --- a/tests/7EFBCDAE/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/7EFBCDAE - -3D -> Hypoelasticity -> 1 Fluid(s): [case.py](case.py). diff --git a/tests/7EFBCDAE/case.py b/tests/7EFBCDAE/case.py deleted file mode 100644 index 4504b07377..0000000000 --- a/tests/7EFBCDAE/case.py +++ /dev/null @@ -1,179 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/7EFBCDAE/case.py: -# 3D -> Hypoelasticity -> 1 Fluid(s) - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/7EFBCDAE/case.py", - description="tests/7EFBCDAE/case.py: 3D -> Hypoelasticity -> 1 Fluid(s)", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-06, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 1, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1000000.0, - "patch_icpp(1)%alpha_rho(1)": 1000.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 100000.0, - "patch_icpp(2)%alpha_rho(1)": 1000.0, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 500000.0, - "patch_icpp(3)%alpha_rho(1)": 1000.0, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 0.3, - "fluid_pp(1)%pi_inf": 780000.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "hypoelasticity": "T", - "patch_icpp(1)%tau_e(1)": 0.0, - "patch_icpp(2)%tau_e(1)": 0.0, - "patch_icpp(3)%tau_e(1)": 0.0, - "fluid_pp(1)%G": 100000.0, - "patch_icpp(1)%tau_e(2)": 0.0, - "patch_icpp(1)%tau_e(3)": 0.0, - "patch_icpp(2)%tau_e(2)": 0.0, - "patch_icpp(2)%tau_e(3)": 0.0, - "patch_icpp(3)%tau_e(2)": 0.0, - "patch_icpp(3)%tau_e(3)": 0.0, - "patch_icpp(1)%tau_e(4)": 0.0, - "patch_icpp(1)%tau_e(5)": 0.0, - "patch_icpp(1)%tau_e(6)": 0.0, - "patch_icpp(2)%tau_e(4)": 0.0, - "patch_icpp(2)%tau_e(5)": 0.0, - "patch_icpp(2)%tau_e(6)": 0.0, - "patch_icpp(3)%tau_e(4)": 0.0, - "patch_icpp(3)%tau_e(5)": 0.0, - "patch_icpp(3)%tau_e(6)": 0.0 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/7FC6826B/README.md b/tests/7FC6826B/README.md deleted file mode 100644 index 2d45854d76..0000000000 --- a/tests/7FC6826B/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/7FC6826B - -1D -> Bubbles -> Monopole -> Polytropic -> bubble_model=2: [case.py](case.py). diff --git a/tests/83291843/README.md b/tests/83291843/README.md deleted file mode 100644 index 27364e4711..0000000000 --- a/tests/83291843/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/83291843 - -2D -> Viscosity -> Bubbles -> QBMM -> bubble_model=3: [case.py](case.py). diff --git a/tests/8360C26B/README.md b/tests/8360C26B/README.md deleted file mode 100644 index 97b79f15ec..0000000000 --- a/tests/8360C26B/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/8360C26B - -2D -> Viscosity -> Bubbles -> nb=1: [case.py](case.py). diff --git a/tests/83EFC30C/README.md b/tests/83EFC30C/README.md deleted file mode 100644 index 8171f797ea..0000000000 --- a/tests/83EFC30C/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/83EFC30C - -1D -> 2 Fluid(s) -> riemann_solver=1 -> wave_speeds=2: [case.py](case.py). diff --git a/tests/84017671/README.md b/tests/84017671/README.md deleted file mode 100644 index 49472a6471..0000000000 --- a/tests/84017671/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/84017671 - -1D -> weno_order=5 -> mapped_weno=F -> mp_weno=F: [case.py](case.py). diff --git a/tests/842C6FFC/README.md b/tests/842C6FFC/README.md deleted file mode 100644 index 078ab41531..0000000000 --- a/tests/842C6FFC/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/842C6FFC - -1D -> Phase Change model 6 -> 2 Fluid(s): [case.py](case.py). diff --git a/tests/851F7AE2/README.md b/tests/851F7AE2/README.md deleted file mode 100644 index c2238460d4..0000000000 --- a/tests/851F7AE2/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/851F7AE2 - -3D -> 2 Fluid(s) -> riemann_solver=1 -> avg_state=1: [case.py](case.py). diff --git a/tests/851F7AE2/case.py b/tests/851F7AE2/case.py deleted file mode 100644 index 7b8812753a..0000000000 --- a/tests/851F7AE2/case.py +++ /dev/null @@ -1,167 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/851F7AE2/case.py: -# 3D -> 2 Fluid(s) -> riemann_solver=1 -> avg_state=1 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/851F7AE2/case.py", - description="tests/851F7AE2/case.py: 3D -> 2 Fluid(s) -> riemann_solver=1 -> avg_state=1", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 2, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 1, - "wave_speeds": 1, - "avg_state": 1, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.81, - "patch_icpp(1)%alpha(1)": 0.9, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.25, - "patch_icpp(2)%alpha(1)": 0.5, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.08, - "patch_icpp(3)%alpha(1)": 0.2, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "patch_icpp(1)%alpha_rho(2)": 0.19, - "patch_icpp(1)%alpha(2)": 0.1, - "patch_icpp(2)%alpha_rho(2)": 0.25, - "patch_icpp(2)%alpha(2)": 0.5, - "patch_icpp(3)%alpha_rho(2)": 0.0225, - "patch_icpp(3)%alpha(2)": 0.8 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/8A341282/README.md b/tests/8A341282/README.md deleted file mode 100644 index 53bdb14874..0000000000 --- a/tests/8A341282/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/8A341282 - -3D -> Bubbles -> Monopole -> nb=1: [case.py](case.py). diff --git a/tests/8A341282/case.py b/tests/8A341282/case.py deleted file mode 100644 index 3a1bf03fcc..0000000000 --- a/tests/8A341282/case.py +++ /dev/null @@ -1,176 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/8A341282/case.py: -# 3D -> Bubbles -> Monopole -> nb=1 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/8A341282/case.py", - description="tests/8A341282/case.py: 3D -> Bubbles -> Monopole -> nb=1", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-06, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.96, - "patch_icpp(1)%alpha(1)": 0.04, - "patch_icpp(2)%pres": 1.0, - "patch_icpp(2)%alpha_rho(1)": 0.96, - "patch_icpp(2)%alpha(1)": 0.04, - "patch_icpp(3)%pres": 1.0, - "patch_icpp(3)%alpha_rho(1)": 0.96, - "patch_icpp(3)%alpha(1)": 0.04, - "fluid_pp(1)%gamma": 0.16, - "fluid_pp(1)%pi_inf": 3515.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "T", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 2, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "T", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "nb": 1, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "fluid_pp(1)%mul0": 0.001002, - "fluid_pp(1)%ss": 0.07275, - "fluid_pp(1)%pv": 2338.8, - "fluid_pp(1)%gamma_v": 1.33, - "fluid_pp(1)%M_v": 18.02, - "fluid_pp(1)%mu_v": 8.816e-06, - "fluid_pp(1)%k_v": 0.019426, - "fluid_pp(2)%gamma_v": 1.4, - "fluid_pp(2)%M_v": 28.97, - "fluid_pp(2)%mu_v": 1.8e-05, - "fluid_pp(2)%k_v": 0.02556, - "Mono(1)%loc(2)": 0.5, - "Mono(1)%loc(3)": 0.5, - "Mono(1)%support": 3 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/8A59E8E6/README.md b/tests/8A59E8E6/README.md deleted file mode 100644 index fc50dcf210..0000000000 --- a/tests/8A59E8E6/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/8A59E8E6 - -1D -> bc=-2: [case.py](case.py). diff --git a/tests/8B679445/README.md b/tests/8B679445/README.md deleted file mode 100644 index 9c1d7ec5bb..0000000000 --- a/tests/8B679445/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/8B679445 - -3D -> Viscosity -> Bubbles -> Polytropic -> bubble_model=2: [case.py](case.py). diff --git a/tests/8B679445/case.py b/tests/8B679445/case.py deleted file mode 100644 index 2b8ad413de..0000000000 --- a/tests/8B679445/case.py +++ /dev/null @@ -1,174 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/8B679445/case.py: -# 3D -> Viscosity -> Bubbles -> Polytropic -> bubble_model=2 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/8B679445/case.py", - description="tests/8B679445/case.py: 3D -> Viscosity -> Bubbles -> Polytropic -> bubble_model=2", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-06, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.96, - "patch_icpp(1)%alpha(1)": 0.04, - "patch_icpp(2)%pres": 1.0, - "patch_icpp(2)%alpha_rho(1)": 0.96, - "patch_icpp(2)%alpha(1)": 0.04, - "patch_icpp(3)%pres": 1.0, - "patch_icpp(3)%alpha_rho(1)": 0.96, - "patch_icpp(3)%alpha(1)": 0.04, - "fluid_pp(1)%gamma": 0.16, - "fluid_pp(1)%pi_inf": 3515.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "T", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 2, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(1)%Re(1)": 50, - "nb": 1, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "fluid_pp(1)%mul0": 0.001002, - "fluid_pp(1)%ss": 0.07275, - "fluid_pp(1)%pv": 2338.8, - "fluid_pp(1)%gamma_v": 1.33, - "fluid_pp(1)%M_v": 18.02, - "fluid_pp(1)%mu_v": 8.816e-06, - "fluid_pp(1)%k_v": 0.019426, - "fluid_pp(2)%gamma_v": 1.4, - "fluid_pp(2)%M_v": 28.97, - "fluid_pp(2)%mu_v": 1.8e-05, - "fluid_pp(2)%k_v": 0.02556 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/8BCBAED8/README.md b/tests/8BCBAED8/README.md deleted file mode 100644 index 893db0c979..0000000000 --- a/tests/8BCBAED8/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/8BCBAED8 - -3D -> bc=-16: [case.py](case.py). diff --git a/tests/8BCBAED8/case.py b/tests/8BCBAED8/case.py deleted file mode 100644 index aa18893b54..0000000000 --- a/tests/8BCBAED8/case.py +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/8BCBAED8/case.py: -# 3D -> bc=-16 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/8BCBAED8/case.py", - description="tests/8BCBAED8/case.py: 3D -> bc=-16", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -16, - "bc_x%end": -16, - "bc_y%beg": -16, - "bc_y%end": -16, - "bc_z%beg": -16, - "bc_z%end": -16, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/8C7AA13B/README.md b/tests/8C7AA13B/README.md deleted file mode 100644 index 209f1db10d..0000000000 --- a/tests/8C7AA13B/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/8C7AA13B - -2D -> 2 MPI Ranks: [case.py](case.py). diff --git a/tests/8E3D99E6/README.md b/tests/8E3D99E6/README.md deleted file mode 100644 index 25e247bf4c..0000000000 --- a/tests/8E3D99E6/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/8E3D99E6 - -1D -> 1 Fluid(s) -> Viscous -> weno_Re_flux: [case.py](case.py). diff --git a/tests/8EAC3DA7/README.md b/tests/8EAC3DA7/README.md deleted file mode 100644 index 3c0073894e..0000000000 --- a/tests/8EAC3DA7/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/8EAC3DA7 - -1D -> 1 Fluid(s) -> Viscous: [case.py](case.py). diff --git a/tests/8FDEE23A/README.md b/tests/8FDEE23A/README.md deleted file mode 100644 index 2b691a26a9..0000000000 --- a/tests/8FDEE23A/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/8FDEE23A - -2D -> bc=-11: [case.py](case.py). diff --git a/tests/939D6718/README.md b/tests/939D6718/README.md deleted file mode 100644 index 06cf54f30e..0000000000 --- a/tests/939D6718/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/939D6718 - -3D -> Cylindrical -> Viscous -> weno_Re_flux: [case.py](case.py). diff --git a/tests/939D6718/case.py b/tests/939D6718/case.py deleted file mode 100644 index 50f81adb4e..0000000000 --- a/tests/939D6718/case.py +++ /dev/null @@ -1,176 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/939D6718/case.py: -# 3D -> Cylindrical -> Viscous -> weno_Re_flux - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/939D6718/case.py", - description="tests/939D6718/case.py: 3D -> Cylindrical -> Viscous -> weno_Re_flux", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 29, - "n": 29, - "p": 29, - "dt": 1e-11, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 2, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.81, - "patch_icpp(1)%alpha(1)": 0.9, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.25, - "patch_icpp(2)%alpha(1)": 0.5, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.08, - "patch_icpp(3)%alpha(1)": 0.2, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 5.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 6.283185307179586, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -14, - "bc_y%end": -3, - "bc_z%beg": -1, - "bc_z%end": -1, - "patch_icpp(1)%geometry": 10, - "patch_icpp(1)%z_centroid": 0.0, - "patch_icpp(1)%length_z": -1000000.0, - "patch_icpp(2)%z_centroid": 0.0, - "patch_icpp(2)%length_z": -1000000.0, - "patch_icpp(3)%z_centroid": 0.0, - "patch_icpp(3)%length_z": -1000000.0, - "patch_icpp(1)%y_centroid": 0.0, - "patch_icpp(1)%length_y": -1000000.0, - "patch_icpp(1)%x_centroid": 0.5, - "patch_icpp(1)%length_x": 1.0, - "patch_icpp(1)%vel(1)": 0.0, - "patch_icpp(1)%vel(2)": 0.0, - "patch_icpp(1)%vel(3)": 0.0, - "patch_icpp(2)%geometry": 10, - "patch_icpp(2)%y_centroid": 0.0, - "patch_icpp(2)%length_y": -1000000.0, - "patch_icpp(2)%x_centroid": 2.5, - "patch_icpp(2)%length_x": 3.0, - "patch_icpp(2)%vel(1)": 0.0, - "patch_icpp(2)%vel(2)": 0.0, - "patch_icpp(2)%vel(3)": 0.0, - "patch_icpp(3)%geometry": 10, - "patch_icpp(3)%y_centroid": 0.0, - "patch_icpp(3)%length_y": -1000000.0, - "patch_icpp(3)%x_centroid": 4.5, - "patch_icpp(3)%length_x": 1.0, - "patch_icpp(3)%vel(1)": 0.0, - "patch_icpp(3)%vel(2)": 0.0, - "patch_icpp(3)%vel(3)": 0.0, - "cyl_coord": "T", - "patch_icpp(1)%radius": 1.0, - "patch_icpp(2)%radius": 1.0, - "patch_icpp(3)%radius": 1.0, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "patch_icpp(1)%alpha_rho(2)": 0.19, - "patch_icpp(1)%alpha(2)": 0.1, - "patch_icpp(2)%alpha_rho(2)": 0.25, - "patch_icpp(2)%alpha(2)": 0.5, - "patch_icpp(3)%alpha_rho(2)": 0.0225, - "patch_icpp(3)%alpha(2)": 0.8, - "fluid_pp(1)%Re(1)": 0.0001, - "fluid_pp(1)%Re(2)": 0.0001, - "fluid_pp(2)%Re(1)": 0.0001, - "fluid_pp(2)%Re(2)": 0.0001, - "weno_Re_flux": "T" -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/9465D0F5/README.md b/tests/9465D0F5/README.md deleted file mode 100644 index 502847ccb5..0000000000 --- a/tests/9465D0F5/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/9465D0F5 - -1D -> Viscosity -> Bubbles -> Polytropic -> bubble_model=2: [case.py](case.py). diff --git a/tests/98081DA3/README.md b/tests/98081DA3/README.md deleted file mode 100644 index 8126035ed7..0000000000 --- a/tests/98081DA3/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/98081DA3 - -2D -> bc=-16: [case.py](case.py). diff --git a/tests/9ACD5174/README.md b/tests/9ACD5174/README.md deleted file mode 100644 index 40a53b084f..0000000000 --- a/tests/9ACD5174/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/9ACD5174 - -3D -> 1 Fluid(s) -> riemann_solver=1 -> mixture_err: [case.py](case.py). diff --git a/tests/9ACD5174/case.py b/tests/9ACD5174/case.py deleted file mode 100644 index 1736e870b8..0000000000 --- a/tests/9ACD5174/case.py +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/9ACD5174/case.py: -# 3D -> 1 Fluid(s) -> riemann_solver=1 -> mixture_err - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/9ACD5174/case.py", - description="tests/9ACD5174/case.py: 3D -> 1 Fluid(s) -> riemann_solver=1 -> mixture_err", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "T", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 1, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/9CB03CEF/README.md b/tests/9CB03CEF/README.md deleted file mode 100644 index fad193a4bf..0000000000 --- a/tests/9CB03CEF/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/9CB03CEF - -2D -> 2 Fluid(s) -> Viscous: [case.py](case.py). diff --git a/tests/9DAC4DDC/README.md b/tests/9DAC4DDC/README.md deleted file mode 100644 index 786975b519..0000000000 --- a/tests/9DAC4DDC/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/9DAC4DDC - -1D -> 2 Fluid(s) -> riemann_solver=2 -> alt_soundspeed: [case.py](case.py). diff --git a/tests/9EB947DB/README.md b/tests/9EB947DB/README.md deleted file mode 100644 index e3e3b55000..0000000000 --- a/tests/9EB947DB/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/9EB947DB - -1D -> Hypoelasticity -> 1 Fluid(s): [case.py](case.py). diff --git a/tests/9EF19F0A/README.md b/tests/9EF19F0A/README.md deleted file mode 100644 index 9fc6b62f8d..0000000000 --- a/tests/9EF19F0A/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/9EF19F0A - -1D -> Phase Change model 5 -> 3 Fluid(s): [case.py](case.py). diff --git a/tests/9F3B58E7/README.md b/tests/9F3B58E7/README.md deleted file mode 100644 index 2fb8f4718e..0000000000 --- a/tests/9F3B58E7/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/9F3B58E7 - -2D -> Viscosity -> Bubbles -> Polytropic -> bubble_model=2: [case.py](case.py). diff --git a/tests/A0B82851/README.md b/tests/A0B82851/README.md deleted file mode 100644 index 1dd51b9537..0000000000 --- a/tests/A0B82851/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/A0B82851 - -3D -> 2 Fluid(s) -> riemann_solver=2 -> mpp_lim: [case.py](case.py). diff --git a/tests/A0B82851/case.py b/tests/A0B82851/case.py deleted file mode 100644 index 389be206fb..0000000000 --- a/tests/A0B82851/case.py +++ /dev/null @@ -1,167 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/A0B82851/case.py: -# 3D -> 2 Fluid(s) -> riemann_solver=2 -> mpp_lim - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/A0B82851/case.py", - description="tests/A0B82851/case.py: 3D -> 2 Fluid(s) -> riemann_solver=2 -> mpp_lim", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 2, - "adv_alphan": "T", - "mpp_lim": "T", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.81, - "patch_icpp(1)%alpha(1)": 0.9, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.25, - "patch_icpp(2)%alpha(1)": 0.5, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.08, - "patch_icpp(3)%alpha(1)": 0.2, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "patch_icpp(1)%alpha_rho(2)": 0.19, - "patch_icpp(1)%alpha(2)": 0.1, - "patch_icpp(2)%alpha_rho(2)": 0.25, - "patch_icpp(2)%alpha(2)": 0.5, - "patch_icpp(3)%alpha_rho(2)": 0.0225, - "patch_icpp(3)%alpha(2)": 0.8 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/A5C93D62/README.md b/tests/A5C93D62/README.md deleted file mode 100644 index 426aa82ea1..0000000000 --- a/tests/A5C93D62/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/A5C93D62 - -2D -> 2 Fluid(s) -> riemann_solver=1 -> wave_speeds=2: [case.py](case.py). diff --git a/tests/A60691E7/README.md b/tests/A60691E7/README.md deleted file mode 100644 index 128fc3b381..0000000000 --- a/tests/A60691E7/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/A60691E7 - -1D -> bc=-11: [case.py](case.py). diff --git a/tests/A6AC2E06/README.md b/tests/A6AC2E06/README.md deleted file mode 100644 index 0031707d61..0000000000 --- a/tests/A6AC2E06/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/A6AC2E06 - -2D -> 2 Fluid(s) -> riemann_solver=1 -> mpp_lim: [case.py](case.py). diff --git a/tests/A6E65782/README.md b/tests/A6E65782/README.md deleted file mode 100644 index 77e137d329..0000000000 --- a/tests/A6E65782/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/A6E65782 - -2D -> bc=-5: [case.py](case.py). diff --git a/tests/A6EEAE2D/README.md b/tests/A6EEAE2D/README.md deleted file mode 100644 index 67f25382b6..0000000000 --- a/tests/A6EEAE2D/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/A6EEAE2D - -2D -> Bubbles -> Monopole -> QBMM -> bubble_model=3 -> Non-polytropic: [case.py](case.py). diff --git a/tests/A83CADB5/README.md b/tests/A83CADB5/README.md deleted file mode 100644 index d1e1258a96..0000000000 --- a/tests/A83CADB5/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/A83CADB5 - -1D -> Phase Change model 5 -> 2 Fluid(s): [case.py](case.py). diff --git a/tests/AACF1BC5/README.md b/tests/AACF1BC5/README.md deleted file mode 100644 index 3dc4988a7e..0000000000 --- a/tests/AACF1BC5/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/AACF1BC5 - -3D -> 2 Fluid(s) -> riemann_solver=2 -> mixture_err: [case.py](case.py). diff --git a/tests/AACF1BC5/case.py b/tests/AACF1BC5/case.py deleted file mode 100644 index ec2d51934c..0000000000 --- a/tests/AACF1BC5/case.py +++ /dev/null @@ -1,167 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/AACF1BC5/case.py: -# 3D -> 2 Fluid(s) -> riemann_solver=2 -> mixture_err - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/AACF1BC5/case.py", - description="tests/AACF1BC5/case.py: 3D -> 2 Fluid(s) -> riemann_solver=2 -> mixture_err", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 2, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "T", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.81, - "patch_icpp(1)%alpha(1)": 0.9, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.25, - "patch_icpp(2)%alpha(1)": 0.5, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.08, - "patch_icpp(3)%alpha(1)": 0.2, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "patch_icpp(1)%alpha_rho(2)": 0.19, - "patch_icpp(1)%alpha(2)": 0.1, - "patch_icpp(2)%alpha_rho(2)": 0.25, - "patch_icpp(2)%alpha(2)": 0.5, - "patch_icpp(3)%alpha_rho(2)": 0.0225, - "patch_icpp(3)%alpha(2)": 0.8 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/AB04C64D/README.md b/tests/AB04C64D/README.md deleted file mode 100644 index e8087779c2..0000000000 --- a/tests/AB04C64D/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/AB04C64D - -3D -> Bubbles -> Monopole -> QBMM: [case.py](case.py). diff --git a/tests/AB04C64D/case.py b/tests/AB04C64D/case.py deleted file mode 100644 index 353ff19b07..0000000000 --- a/tests/AB04C64D/case.py +++ /dev/null @@ -1,176 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/AB04C64D/case.py: -# 3D -> Bubbles -> Monopole -> QBMM - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/AB04C64D/case.py", - description="tests/AB04C64D/case.py: 3D -> Bubbles -> Monopole -> QBMM", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-06, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.96, - "patch_icpp(1)%alpha(1)": 0.04, - "patch_icpp(2)%pres": 1.0, - "patch_icpp(2)%alpha_rho(1)": 0.96, - "patch_icpp(2)%alpha(1)": 0.04, - "patch_icpp(3)%pres": 1.0, - "patch_icpp(3)%alpha_rho(1)": 0.96, - "patch_icpp(3)%alpha(1)": 0.04, - "fluid_pp(1)%gamma": 0.16, - "fluid_pp(1)%pi_inf": 3515.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "T", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 2, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "T", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "T", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "nb": 3, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "fluid_pp(1)%mul0": 0.001002, - "fluid_pp(1)%ss": 0.07275, - "fluid_pp(1)%pv": 2338.8, - "fluid_pp(1)%gamma_v": 1.33, - "fluid_pp(1)%M_v": 18.02, - "fluid_pp(1)%mu_v": 8.816e-06, - "fluid_pp(1)%k_v": 0.019426, - "fluid_pp(2)%gamma_v": 1.4, - "fluid_pp(2)%M_v": 28.97, - "fluid_pp(2)%mu_v": 1.8e-05, - "fluid_pp(2)%k_v": 0.02556, - "Mono(1)%loc(2)": 0.5, - "Mono(1)%loc(3)": 0.5, - "Mono(1)%support": 3 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/AB0BE4E4/README.md b/tests/AB0BE4E4/README.md deleted file mode 100644 index a6f3bd072d..0000000000 --- a/tests/AB0BE4E4/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/AB0BE4E4 - -3D -> 1 Fluid(s) -> riemann_solver=2 -> avg_state=1: [case.py](case.py). diff --git a/tests/AB0BE4E4/case.py b/tests/AB0BE4E4/case.py deleted file mode 100644 index 118e9e8821..0000000000 --- a/tests/AB0BE4E4/case.py +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/AB0BE4E4/case.py: -# 3D -> 1 Fluid(s) -> riemann_solver=2 -> avg_state=1 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/AB0BE4E4/case.py", - description="tests/AB0BE4E4/case.py: 3D -> 1 Fluid(s) -> riemann_solver=2 -> avg_state=1", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 1, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/ABAC3AE3/README.md b/tests/ABAC3AE3/README.md deleted file mode 100644 index d7b0ce05f5..0000000000 --- a/tests/ABAC3AE3/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/ABAC3AE3 - -3D -> bc=-8: [case.py](case.py). diff --git a/tests/AD63A4A5/README.md b/tests/AD63A4A5/README.md deleted file mode 100644 index 8928d78b35..0000000000 --- a/tests/AD63A4A5/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/AD63A4A5 - -3D -> Bubbles -> Monopole -> Polytropic -> bubble_model=2: [case.py](case.py). diff --git a/tests/AD63A4A5/case.py b/tests/AD63A4A5/case.py deleted file mode 100644 index 29e20f8b86..0000000000 --- a/tests/AD63A4A5/case.py +++ /dev/null @@ -1,176 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/AD63A4A5/case.py: -# 3D -> Bubbles -> Monopole -> Polytropic -> bubble_model=2 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/AD63A4A5/case.py", - description="tests/AD63A4A5/case.py: 3D -> Bubbles -> Monopole -> Polytropic -> bubble_model=2", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-06, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.96, - "patch_icpp(1)%alpha(1)": 0.04, - "patch_icpp(2)%pres": 1.0, - "patch_icpp(2)%alpha_rho(1)": 0.96, - "patch_icpp(2)%alpha(1)": 0.04, - "patch_icpp(3)%pres": 1.0, - "patch_icpp(3)%alpha_rho(1)": 0.96, - "patch_icpp(3)%alpha(1)": 0.04, - "fluid_pp(1)%gamma": 0.16, - "fluid_pp(1)%pi_inf": 3515.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "T", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 2, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "T", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "nb": 3, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "fluid_pp(1)%mul0": 0.001002, - "fluid_pp(1)%ss": 0.07275, - "fluid_pp(1)%pv": 2338.8, - "fluid_pp(1)%gamma_v": 1.33, - "fluid_pp(1)%M_v": 18.02, - "fluid_pp(1)%mu_v": 8.816e-06, - "fluid_pp(1)%k_v": 0.019426, - "fluid_pp(2)%gamma_v": 1.4, - "fluid_pp(2)%M_v": 28.97, - "fluid_pp(2)%mu_v": 1.8e-05, - "fluid_pp(2)%k_v": 0.02556, - "Mono(1)%loc(2)": 0.5, - "Mono(1)%loc(3)": 0.5, - "Mono(1)%support": 3 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/AE37D842/README.md b/tests/AE37D842/README.md deleted file mode 100644 index a47a02d8cb..0000000000 --- a/tests/AE37D842/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/AE37D842 - -2D -> Bubbles -> Monopole -> nb=1: [case.py](case.py). diff --git a/tests/AED93D34/README.md b/tests/AED93D34/README.md deleted file mode 100644 index 0ae4a144e2..0000000000 --- a/tests/AED93D34/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/AED93D34 - -1D -> bc=-8: [case.py](case.py). diff --git a/tests/AF0BCEE4/README.md b/tests/AF0BCEE4/README.md deleted file mode 100644 index 3e3bba422c..0000000000 --- a/tests/AF0BCEE4/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/AF0BCEE4 - -1D -> Hypoelasticity -> 2 Fluid(s): [case.py](case.py). diff --git a/tests/AF46C382/README.md b/tests/AF46C382/README.md deleted file mode 100644 index 8d47c2a1f4..0000000000 --- a/tests/AF46C382/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/AF46C382 - -1D -> Bubbles -> Monopole -> QBMM -> bubble_model=3: [case.py](case.py). diff --git a/tests/B33E256A/README.md b/tests/B33E256A/README.md deleted file mode 100644 index 99e6263400..0000000000 --- a/tests/B33E256A/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/B33E256A - -3D -> 2 Fluid(s) -> riemann_solver=2 -> avg_state=1: [case.py](case.py). diff --git a/tests/B33E256A/case.py b/tests/B33E256A/case.py deleted file mode 100644 index 7b87a579f6..0000000000 --- a/tests/B33E256A/case.py +++ /dev/null @@ -1,167 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/B33E256A/case.py: -# 3D -> 2 Fluid(s) -> riemann_solver=2 -> avg_state=1 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/B33E256A/case.py", - description="tests/B33E256A/case.py: 3D -> 2 Fluid(s) -> riemann_solver=2 -> avg_state=1", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 2, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 1, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.81, - "patch_icpp(1)%alpha(1)": 0.9, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.25, - "patch_icpp(2)%alpha(1)": 0.5, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.08, - "patch_icpp(3)%alpha(1)": 0.2, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "patch_icpp(1)%alpha_rho(2)": 0.19, - "patch_icpp(1)%alpha(2)": 0.1, - "patch_icpp(2)%alpha_rho(2)": 0.25, - "patch_icpp(2)%alpha(2)": 0.5, - "patch_icpp(3)%alpha_rho(2)": 0.0225, - "patch_icpp(3)%alpha(2)": 0.8 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/B3AAC9C8/README.md b/tests/B3AAC9C8/README.md deleted file mode 100644 index 32fd76a7bd..0000000000 --- a/tests/B3AAC9C8/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/B3AAC9C8 - -2D -> Axisymmetric -> Viscous -> weno_Re_flux: [case.py](case.py). diff --git a/tests/B3C85904/README.md b/tests/B3C85904/README.md deleted file mode 100644 index 1a95fa32bc..0000000000 --- a/tests/B3C85904/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/B3C85904 - -1D -> weno_order=3 -> mapped_weno=F -> mp_weno=F: [case.py](case.py). diff --git a/tests/B7250A5B/README.md b/tests/B7250A5B/README.md deleted file mode 100644 index 0b6c18c974..0000000000 --- a/tests/B7250A5B/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/B7250A5B - -3D -> 2 Fluid(s) -> Viscous -> weno_Re_flux -> weno_avg: [case.py](case.py). diff --git a/tests/B7250A5B/case.py b/tests/B7250A5B/case.py deleted file mode 100644 index 4d1397ca39..0000000000 --- a/tests/B7250A5B/case.py +++ /dev/null @@ -1,173 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/B7250A5B/case.py: -# 3D -> 2 Fluid(s) -> Viscous -> weno_Re_flux -> weno_avg - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/B7250A5B/case.py", - description="tests/B7250A5B/case.py: 3D -> 2 Fluid(s) -> Viscous -> weno_Re_flux -> weno_avg", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-11, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 2, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.81, - "patch_icpp(1)%alpha(1)": 0.9, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.25, - "patch_icpp(2)%alpha(1)": 0.5, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.08, - "patch_icpp(3)%alpha(1)": 0.2, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "patch_icpp(1)%x_centroid": 0.5, - "patch_icpp(1)%length_x": 1, - "patch_icpp(1)%vel(1)": 1.0, - "patch_icpp(1)%vel(2)": 0.0, - "patch_icpp(1)%vel(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "patch_icpp(1)%alpha_rho(2)": 0.19, - "patch_icpp(1)%alpha(2)": 0.1, - "patch_icpp(2)%alpha_rho(2)": 0.25, - "patch_icpp(2)%alpha(2)": 0.5, - "patch_icpp(3)%alpha_rho(2)": 0.0225, - "patch_icpp(3)%alpha(2)": 0.8, - "fluid_pp(1)%Re(1)": 0.001, - "fluid_pp(1)%Re(2)": 0.001, - "fluid_pp(2)%Re(1)": 0.001, - "fluid_pp(2)%Re(2)": 0.001, - "weno_Re_flux": "T", - "weno_avg": "T" -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/B89B8C70/README.md b/tests/B89B8C70/README.md deleted file mode 100644 index 91676f00d4..0000000000 --- a/tests/B89B8C70/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/B89B8C70 - -2D -> Axisymmetric -> model_eqns=3: [case.py](case.py). diff --git a/tests/B8F5F1C8/README.md b/tests/B8F5F1C8/README.md deleted file mode 100644 index 2a0c5a2c14..0000000000 --- a/tests/B8F5F1C8/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/B8F5F1C8 - -3D -> 2 Fluid(s) -> riemann_solver=2 -> wave_speeds=2: [case.py](case.py). diff --git a/tests/B8F5F1C8/case.py b/tests/B8F5F1C8/case.py deleted file mode 100644 index a390f566d8..0000000000 --- a/tests/B8F5F1C8/case.py +++ /dev/null @@ -1,167 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/B8F5F1C8/case.py: -# 3D -> 2 Fluid(s) -> riemann_solver=2 -> wave_speeds=2 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/B8F5F1C8/case.py", - description="tests/B8F5F1C8/case.py: 3D -> 2 Fluid(s) -> riemann_solver=2 -> wave_speeds=2", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 2, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 2, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.81, - "patch_icpp(1)%alpha(1)": 0.9, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.25, - "patch_icpp(2)%alpha(1)": 0.5, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.08, - "patch_icpp(3)%alpha(1)": 0.2, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "patch_icpp(1)%alpha_rho(2)": 0.19, - "patch_icpp(1)%alpha(2)": 0.1, - "patch_icpp(2)%alpha_rho(2)": 0.25, - "patch_icpp(2)%alpha(2)": 0.5, - "patch_icpp(3)%alpha_rho(2)": 0.0225, - "patch_icpp(3)%alpha(2)": 0.8 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/B96AC58F/README.md b/tests/B96AC58F/README.md deleted file mode 100644 index 314d24f675..0000000000 --- a/tests/B96AC58F/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/B96AC58F - -2D -> bc=-10: [case.py](case.py). diff --git a/tests/BD8004FF/README.md b/tests/BD8004FF/README.md deleted file mode 100644 index c16c557049..0000000000 --- a/tests/BD8004FF/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/BD8004FF - -3D -> 2 Fluid(s) -> riemann_solver=1 -> wave_speeds=2: [case.py](case.py). diff --git a/tests/BD8004FF/case.py b/tests/BD8004FF/case.py deleted file mode 100644 index ebac0c5470..0000000000 --- a/tests/BD8004FF/case.py +++ /dev/null @@ -1,167 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/BD8004FF/case.py: -# 3D -> 2 Fluid(s) -> riemann_solver=1 -> wave_speeds=2 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/BD8004FF/case.py", - description="tests/BD8004FF/case.py: 3D -> 2 Fluid(s) -> riemann_solver=1 -> wave_speeds=2", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 2, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 1, - "wave_speeds": 2, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.81, - "patch_icpp(1)%alpha(1)": 0.9, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.25, - "patch_icpp(2)%alpha(1)": 0.5, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.08, - "patch_icpp(3)%alpha(1)": 0.2, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "patch_icpp(1)%alpha_rho(2)": 0.19, - "patch_icpp(1)%alpha(2)": 0.1, - "patch_icpp(2)%alpha_rho(2)": 0.25, - "patch_icpp(2)%alpha(2)": 0.5, - "patch_icpp(3)%alpha_rho(2)": 0.0225, - "patch_icpp(3)%alpha(2)": 0.8 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/BDD3411B/README.md b/tests/BDD3411B/README.md deleted file mode 100644 index cbb86e8a6a..0000000000 --- a/tests/BDD3411B/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/BDD3411B - -3D -> Hypoelasticity -> 2 Fluid(s): [case.py](case.py). diff --git a/tests/BDD3411B/case.py b/tests/BDD3411B/case.py deleted file mode 100644 index a8fa92df1e..0000000000 --- a/tests/BDD3411B/case.py +++ /dev/null @@ -1,188 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/BDD3411B/case.py: -# 3D -> Hypoelasticity -> 2 Fluid(s) - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/BDD3411B/case.py", - description="tests/BDD3411B/case.py: 3D -> Hypoelasticity -> 2 Fluid(s)", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-06, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 2, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 1, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1000000.0, - "patch_icpp(1)%alpha_rho(1)": 900.0, - "patch_icpp(1)%alpha(1)": 0.9, - "patch_icpp(2)%pres": 100000.0, - "patch_icpp(2)%alpha_rho(1)": 100, - "patch_icpp(2)%alpha(1)": 0.1, - "patch_icpp(3)%pres": 500000.0, - "patch_icpp(3)%alpha_rho(1)": 900, - "patch_icpp(3)%alpha(1)": 0.9, - "fluid_pp(1)%gamma": 0.3, - "fluid_pp(1)%pi_inf": 780000.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "hypoelasticity": "T", - "patch_icpp(1)%tau_e(1)": 0.0, - "patch_icpp(2)%tau_e(1)": 0.0, - "patch_icpp(3)%tau_e(1)": 0.0, - "fluid_pp(1)%G": 100000.0, - "fluid_pp(2)%gamma": 0.3, - "fluid_pp(2)%pi_inf": 780000.0, - "patch_icpp(1)%alpha_rho(2)": 100, - "patch_icpp(1)%alpha(2)": 0.1, - "patch_icpp(2)%alpha_rho(2)": 900, - "patch_icpp(2)%alpha(2)": 0.9, - "patch_icpp(3)%alpha_rho(2)": 100, - "patch_icpp(3)%alpha(2)": 0.1, - "fluid_pp(2)%G": 50000.0, - "patch_icpp(1)%tau_e(2)": 0.0, - "patch_icpp(1)%tau_e(3)": 0.0, - "patch_icpp(2)%tau_e(2)": 0.0, - "patch_icpp(2)%tau_e(3)": 0.0, - "patch_icpp(3)%tau_e(2)": 0.0, - "patch_icpp(3)%tau_e(3)": 0.0, - "patch_icpp(1)%tau_e(4)": 0.0, - "patch_icpp(1)%tau_e(5)": 0.0, - "patch_icpp(1)%tau_e(6)": 0.0, - "patch_icpp(2)%tau_e(4)": 0.0, - "patch_icpp(2)%tau_e(5)": 0.0, - "patch_icpp(2)%tau_e(6)": 0.0, - "patch_icpp(3)%tau_e(4)": 0.0, - "patch_icpp(3)%tau_e(5)": 0.0, - "patch_icpp(3)%tau_e(6)": 0.0 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/BF46F657/README.md b/tests/BF46F657/README.md deleted file mode 100644 index eb29dbd8a1..0000000000 --- a/tests/BF46F657/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/BF46F657 - -2D -> bc=-12: [case.py](case.py). diff --git a/tests/C04741B4/README.md b/tests/C04741B4/README.md deleted file mode 100644 index 047cb55f00..0000000000 --- a/tests/C04741B4/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/C04741B4 - -2D -> weno_order=5 -> mapped_weno=T -> mp_weno=F: [case.py](case.py). diff --git a/tests/C06849AD/README.md b/tests/C06849AD/README.md deleted file mode 100644 index 0f6f0967d2..0000000000 --- a/tests/C06849AD/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/C06849AD - -3D -> 1 Fluid(s) -> riemann_solver=2 -> mixture_err: [case.py](case.py). diff --git a/tests/C06849AD/case.py b/tests/C06849AD/case.py deleted file mode 100644 index f716a2c11a..0000000000 --- a/tests/C06849AD/case.py +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/C06849AD/case.py: -# 3D -> 1 Fluid(s) -> riemann_solver=2 -> mixture_err - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/C06849AD/case.py", - description="tests/C06849AD/case.py: 3D -> 1 Fluid(s) -> riemann_solver=2 -> mixture_err", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "T", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/C36F18FB/README.md b/tests/C36F18FB/README.md deleted file mode 100644 index 844228baa7..0000000000 --- a/tests/C36F18FB/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/C36F18FB - -3D -> 1 Fluid(s) -> riemann_solver=2 -> wave_speeds=2: [case.py](case.py). diff --git a/tests/C36F18FB/case.py b/tests/C36F18FB/case.py deleted file mode 100644 index 3c113ea09c..0000000000 --- a/tests/C36F18FB/case.py +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/C36F18FB/case.py: -# 3D -> 1 Fluid(s) -> riemann_solver=2 -> wave_speeds=2 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/C36F18FB/case.py", - description="tests/C36F18FB/case.py: 3D -> 1 Fluid(s) -> riemann_solver=2 -> wave_speeds=2", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 2, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/C4907722/README.md b/tests/C4907722/README.md deleted file mode 100644 index ebeca97165..0000000000 --- a/tests/C4907722/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/C4907722 - -1D -> 2 Fluid(s) -> riemann_solver=2 -> mpp_lim: [case.py](case.py). diff --git a/tests/C4A2FAA3/README.md b/tests/C4A2FAA3/README.md deleted file mode 100644 index a07c4a1da0..0000000000 --- a/tests/C4A2FAA3/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/C4A2FAA3 - -3D -> 2 Fluid(s) -> riemann_solver=1 -> mixture_err: [case.py](case.py). diff --git a/tests/C4A2FAA3/case.py b/tests/C4A2FAA3/case.py deleted file mode 100644 index 3612e8eee6..0000000000 --- a/tests/C4A2FAA3/case.py +++ /dev/null @@ -1,167 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/C4A2FAA3/case.py: -# 3D -> 2 Fluid(s) -> riemann_solver=1 -> mixture_err - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/C4A2FAA3/case.py", - description="tests/C4A2FAA3/case.py: 3D -> 2 Fluid(s) -> riemann_solver=1 -> mixture_err", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 2, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "T", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 1, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.81, - "patch_icpp(1)%alpha(1)": 0.9, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.25, - "patch_icpp(2)%alpha(1)": 0.5, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.08, - "patch_icpp(3)%alpha(1)": 0.2, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "patch_icpp(1)%alpha_rho(2)": 0.19, - "patch_icpp(1)%alpha(2)": 0.1, - "patch_icpp(2)%alpha_rho(2)": 0.25, - "patch_icpp(2)%alpha(2)": 0.5, - "patch_icpp(3)%alpha_rho(2)": 0.0225, - "patch_icpp(3)%alpha(2)": 0.8 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/C5B79059/README.md b/tests/C5B79059/README.md deleted file mode 100644 index 1dbc98ea30..0000000000 --- a/tests/C5B79059/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/C5B79059 - -1D -> bc=-9: [case.py](case.py). diff --git a/tests/C79E1D3C/README.md b/tests/C79E1D3C/README.md deleted file mode 100644 index 7b84bd3205..0000000000 --- a/tests/C79E1D3C/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/C79E1D3C - -1D -> 2 Fluid(s) -> Viscous: [case.py](case.py). diff --git a/tests/C93BE9B5/README.md b/tests/C93BE9B5/README.md deleted file mode 100644 index 8880a783cf..0000000000 --- a/tests/C93BE9B5/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/C93BE9B5 - -3D -> bc=-9: [case.py](case.py). diff --git a/tests/CC4F7C44/README.md b/tests/CC4F7C44/README.md deleted file mode 100644 index 0b4d591f5a..0000000000 --- a/tests/CC4F7C44/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/CC4F7C44 - -2D -> Bubbles -> Monopole -> bubble_model=2: [case.py](case.py). diff --git a/tests/CD3D9660/README.md b/tests/CD3D9660/README.md deleted file mode 100644 index 8bd2a8bfd2..0000000000 --- a/tests/CD3D9660/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/CD3D9660 - -2D -> weno_order=3 -> mapped_weno=T -> mp_weno=F: [case.py](case.py). diff --git a/tests/CD6DC908/README.md b/tests/CD6DC908/README.md deleted file mode 100644 index 7721ade098..0000000000 --- a/tests/CD6DC908/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/CD6DC908 - -2D -> 1 Fluid(s) -> Viscous: [case.py](case.py). diff --git a/tests/CD9D3050/README.md b/tests/CD9D3050/README.md deleted file mode 100644 index 11c8afcc0f..0000000000 --- a/tests/CD9D3050/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/CD9D3050 - -1D -> 2 Fluid(s) -> Viscous -> weno_Re_flux: [case.py](case.py). diff --git a/tests/CE232828/README.md b/tests/CE232828/README.md deleted file mode 100644 index 291abf90d4..0000000000 --- a/tests/CE232828/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/CE232828 - -3D -> 2 MPI Ranks: [case.py](case.py). diff --git a/tests/CFE87594/README.md b/tests/CFE87594/README.md deleted file mode 100644 index d578b10689..0000000000 --- a/tests/CFE87594/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/CFE87594 - -2D -> Bubbles -> Monopole -> QBMM -> Non-polytropic: [case.py](case.py). diff --git a/tests/D0045756/README.md b/tests/D0045756/README.md deleted file mode 100644 index c221d7314e..0000000000 --- a/tests/D0045756/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/D0045756 - -3D -> bc=-10: [case.py](case.py). diff --git a/tests/D3C860B9/README.md b/tests/D3C860B9/README.md deleted file mode 100644 index 8dc1f572cb..0000000000 --- a/tests/D3C860B9/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/D3C860B9 - -2D -> Phase Change model 6 -> 3 Fluid(s): [case.py](case.py). diff --git a/tests/D6BAC936/README.md b/tests/D6BAC936/README.md deleted file mode 100644 index 9d070f1b55..0000000000 --- a/tests/D6BAC936/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/D6BAC936 - -2D -> 2 Fluid(s) -> Viscous -> weno_Re_flux: [case.py](case.py). diff --git a/tests/D79C3E6F/README.md b/tests/D79C3E6F/README.md deleted file mode 100644 index bc1487aadd..0000000000 --- a/tests/D79C3E6F/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/D79C3E6F - -1D -> bc=-1: [case.py](case.py). diff --git a/tests/D972BA0F/README.md b/tests/D972BA0F/README.md deleted file mode 100644 index 7700eaf8cf..0000000000 --- a/tests/D972BA0F/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/D972BA0F - -2D -> bc=-3: [case.py](case.py). diff --git a/tests/DA8AF07E/README.md b/tests/DA8AF07E/README.md deleted file mode 100644 index 555b193162..0000000000 --- a/tests/DA8AF07E/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/DA8AF07E - -2D -> Phase Change model 5 -> 2 Fluid(s): [case.py](case.py). diff --git a/tests/DB670E50/README.md b/tests/DB670E50/README.md deleted file mode 100644 index 3a969cf42e..0000000000 --- a/tests/DB670E50/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/DB670E50 - -2D -> Axisymmetric -> model_eqns=2: [case.py](case.py). diff --git a/tests/DC46C302/README.md b/tests/DC46C302/README.md deleted file mode 100644 index 35106edf6d..0000000000 --- a/tests/DC46C302/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/DC46C302 - -1D -> Bubbles -> Monopole -> QBMM -> bubble_model=3 -> Non-polytropic: [case.py](case.py). diff --git a/tests/DC9CB97E/README.md b/tests/DC9CB97E/README.md deleted file mode 100644 index 59498eff5b..0000000000 --- a/tests/DC9CB97E/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/DC9CB97E - -2D -> 2 Fluid(s) -> riemann_solver=1 -> avg_state=1: [case.py](case.py). diff --git a/tests/DCB3BC6C/README.md b/tests/DCB3BC6C/README.md deleted file mode 100644 index 0a558a5ffd..0000000000 --- a/tests/DCB3BC6C/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/DCB3BC6C - -3D -> Viscosity -> Bubbles -> nb=1: [case.py](case.py). diff --git a/tests/DCB3BC6C/case.py b/tests/DCB3BC6C/case.py deleted file mode 100644 index 7adb9b4eb7..0000000000 --- a/tests/DCB3BC6C/case.py +++ /dev/null @@ -1,174 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/DCB3BC6C/case.py: -# 3D -> Viscosity -> Bubbles -> nb=1 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/DCB3BC6C/case.py", - description="tests/DCB3BC6C/case.py: 3D -> Viscosity -> Bubbles -> nb=1", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-06, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.96, - "patch_icpp(1)%alpha(1)": 0.04, - "patch_icpp(2)%pres": 1.0, - "patch_icpp(2)%alpha_rho(1)": 0.96, - "patch_icpp(2)%alpha(1)": 0.04, - "patch_icpp(3)%pres": 1.0, - "patch_icpp(3)%alpha_rho(1)": 0.96, - "patch_icpp(3)%alpha(1)": 0.04, - "fluid_pp(1)%gamma": 0.16, - "fluid_pp(1)%pi_inf": 3515.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "T", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 2, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(1)%Re(1)": 50, - "nb": 1, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "fluid_pp(1)%mul0": 0.001002, - "fluid_pp(1)%ss": 0.07275, - "fluid_pp(1)%pv": 2338.8, - "fluid_pp(1)%gamma_v": 1.33, - "fluid_pp(1)%M_v": 18.02, - "fluid_pp(1)%mu_v": 8.816e-06, - "fluid_pp(1)%k_v": 0.019426, - "fluid_pp(2)%gamma_v": 1.4, - "fluid_pp(2)%M_v": 28.97, - "fluid_pp(2)%mu_v": 1.8e-05, - "fluid_pp(2)%k_v": 0.02556 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/E09A12D9/README.md b/tests/E09A12D9/README.md deleted file mode 100644 index 50b6c31dec..0000000000 --- a/tests/E09A12D9/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/E09A12D9 - -3D -> bc=-5: [case.py](case.py). diff --git a/tests/E1352143/README.md b/tests/E1352143/README.md deleted file mode 100644 index c5a0e1abd5..0000000000 --- a/tests/E1352143/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/E1352143 - -3D -> weno_order=3 -> mapped_weno=F -> mp_weno=F: [case.py](case.py). diff --git a/tests/E1352143/case.py b/tests/E1352143/case.py deleted file mode 100644 index a70a57af10..0000000000 --- a/tests/E1352143/case.py +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/E1352143/case.py: -# 3D -> weno_order=3 -> mapped_weno=F -> mp_weno=F - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/E1352143/case.py", - description="tests/E1352143/case.py: 3D -> weno_order=3 -> mapped_weno=F -> mp_weno=F", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 3, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/E4EFEDB2/README.md b/tests/E4EFEDB2/README.md deleted file mode 100644 index ec83d5b2c6..0000000000 --- a/tests/E4EFEDB2/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/E4EFEDB2 - -2D -> weno_order=3 -> mapped_weno=F -> mp_weno=F: [case.py](case.py). diff --git a/tests/E76D41CE/README.md b/tests/E76D41CE/README.md deleted file mode 100644 index 951366604f..0000000000 --- a/tests/E76D41CE/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/E76D41CE - -2D -> weno_order=5 -> mapped_weno=F -> mp_weno=T: [case.py](case.py). diff --git a/tests/E84967E7/README.md b/tests/E84967E7/README.md deleted file mode 100644 index 561e7c92d7..0000000000 --- a/tests/E84967E7/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/E84967E7 - -2D -> bc=-7: [case.py](case.py). diff --git a/tests/E8C28D5B/README.md b/tests/E8C28D5B/README.md deleted file mode 100644 index b9dbb5c740..0000000000 --- a/tests/E8C28D5B/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/E8C28D5B - -2D -> 1 Fluid(s) -> Viscous -> weno_Re_flux: [case.py](case.py). diff --git a/tests/EAA53889/README.md b/tests/EAA53889/README.md deleted file mode 100644 index 89bc108451..0000000000 --- a/tests/EAA53889/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/EAA53889 - -2D -> bc=-2: [case.py](case.py). diff --git a/tests/ED728400/README.md b/tests/ED728400/README.md deleted file mode 100644 index 8dc70199e0..0000000000 --- a/tests/ED728400/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/ED728400 - -1D -> bc=-16: [case.py](case.py). diff --git a/tests/EF54219C/README.md b/tests/EF54219C/README.md deleted file mode 100644 index fd44df1aa8..0000000000 --- a/tests/EF54219C/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/EF54219C - -1D -> Bubbles -> Monopole -> Polytropic -> bubble_model=3: [case.py](case.py). diff --git a/tests/F0E6771E/README.md b/tests/F0E6771E/README.md deleted file mode 100644 index b4bba26005..0000000000 --- a/tests/F0E6771E/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/F0E6771E - -3D -> 2 Fluid(s) -> riemann_solver=2 -> model_eqns=3: [case.py](case.py). diff --git a/tests/F0E6771E/case.py b/tests/F0E6771E/case.py deleted file mode 100644 index cd3b6cc403..0000000000 --- a/tests/F0E6771E/case.py +++ /dev/null @@ -1,167 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/F0E6771E/case.py: -# 3D -> 2 Fluid(s) -> riemann_solver=2 -> model_eqns=3 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/F0E6771E/case.py", - description="tests/F0E6771E/case.py: 3D -> 2 Fluid(s) -> riemann_solver=2 -> model_eqns=3", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 3, - "alt_soundspeed": "F", - "num_fluids": 2, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.81, - "patch_icpp(1)%alpha(1)": 0.9, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.25, - "patch_icpp(2)%alpha(1)": 0.5, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.08, - "patch_icpp(3)%alpha(1)": 0.2, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "patch_icpp(1)%alpha_rho(2)": 0.19, - "patch_icpp(1)%alpha(2)": 0.1, - "patch_icpp(2)%alpha_rho(2)": 0.25, - "patch_icpp(2)%alpha(2)": 0.5, - "patch_icpp(3)%alpha_rho(2)": 0.0225, - "patch_icpp(3)%alpha(2)": 0.8 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/F0F175B2/README.md b/tests/F0F175B2/README.md deleted file mode 100644 index 6425662d93..0000000000 --- a/tests/F0F175B2/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/F0F175B2 - -2D -> 2 Fluid(s) -> riemann_solver=2 -> mpp_lim: [case.py](case.py). diff --git a/tests/F1457D58/README.md b/tests/F1457D58/README.md deleted file mode 100644 index 1311bb2d27..0000000000 --- a/tests/F1457D58/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/F1457D58 - -3D -> Bubbles -> Monopole -> QBMM -> Non-polytropic: [case.py](case.py). diff --git a/tests/F1457D58/case.py b/tests/F1457D58/case.py deleted file mode 100644 index 196513d8a3..0000000000 --- a/tests/F1457D58/case.py +++ /dev/null @@ -1,176 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/F1457D58/case.py: -# 3D -> Bubbles -> Monopole -> QBMM -> Non-polytropic - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/F1457D58/case.py", - description="tests/F1457D58/case.py: 3D -> Bubbles -> Monopole -> QBMM -> Non-polytropic", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 24, - "n": 24, - "p": 24, - "dt": 1e-06, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 0.96, - "patch_icpp(1)%alpha(1)": 0.04, - "patch_icpp(2)%pres": 1.0, - "patch_icpp(2)%alpha_rho(1)": 0.96, - "patch_icpp(2)%alpha(1)": 0.04, - "patch_icpp(3)%pres": 1.0, - "patch_icpp(3)%alpha_rho(1)": 0.96, - "patch_icpp(3)%alpha(1)": 0.04, - "fluid_pp(1)%gamma": 0.16, - "fluid_pp(1)%pi_inf": 3515.0, - "fluid_pp(1)%cv": 0.0, - "fluid_pp(1)%qv": 0.0, - "fluid_pp(1)%qvp": 0.0, - "bubbles": "T", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 2, - "polytropic": "F", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "T", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "T", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "z_domain%beg": 0.0, - "z_domain%end": 1.0, - "bc_x%beg": -3, - "bc_x%end": -3, - "bc_y%beg": -3, - "bc_y%end": -3, - "bc_z%beg": -3, - "bc_z%end": -3, - "patch_icpp(1)%geometry": 9, - "patch_icpp(1)%z_centroid": 0.05, - "patch_icpp(1)%length_z": 0.1, - "patch_icpp(2)%z_centroid": 0.45, - "patch_icpp(2)%length_z": 0.7, - "patch_icpp(3)%z_centroid": 0.9, - "patch_icpp(3)%length_z": 0.2, - "patch_icpp(1)%y_centroid": 0.5, - "patch_icpp(1)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(2)%geometry": 9, - "patch_icpp(2)%y_centroid": 0.5, - "patch_icpp(2)%length_y": 1, - "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(3)": 0.0, - "patch_icpp(3)%geometry": 9, - "patch_icpp(3)%y_centroid": 0.5, - "patch_icpp(3)%length_y": 1, - "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(3)": 0.0, - "nb": 3, - "fluid_pp(2)%gamma": 2.5, - "fluid_pp(2)%pi_inf": 0.0, - "fluid_pp(1)%mul0": 0.001002, - "fluid_pp(1)%ss": 0.07275, - "fluid_pp(1)%pv": 2338.8, - "fluid_pp(1)%gamma_v": 1.33, - "fluid_pp(1)%M_v": 18.02, - "fluid_pp(1)%mu_v": 8.816e-06, - "fluid_pp(1)%k_v": 0.019426, - "fluid_pp(2)%gamma_v": 1.4, - "fluid_pp(2)%M_v": 28.97, - "fluid_pp(2)%mu_v": 1.8e-05, - "fluid_pp(2)%k_v": 0.02556, - "Mono(1)%loc(2)": 0.5, - "Mono(1)%loc(3)": 0.5, - "Mono(1)%support": 3 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt(1)'] = 'T' - mods['omega_wrt(2)'] = 'T' - mods['omega_wrt(3)'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/F4F6AC27/README.md b/tests/F4F6AC27/README.md deleted file mode 100644 index 1e7d9590ce..0000000000 --- a/tests/F4F6AC27/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/F4F6AC27 - -1D -> 1 Fluid(s) -> riemann_solver=2 -> wave_speeds=2: [case.py](case.py). diff --git a/tests/F5890628/README.md b/tests/F5890628/README.md deleted file mode 100644 index 1a7a99af9f..0000000000 --- a/tests/F5890628/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/F5890628 - -1D -> weno_order=5 -> mapped_weno=T -> mp_weno=F: [case.py](case.py). diff --git a/tests/F97573DB/README.md b/tests/F97573DB/README.md deleted file mode 100644 index ba8335bb43..0000000000 --- a/tests/F97573DB/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/F97573DB - -1D -> 1 Fluid(s) -> riemann_solver=2 -> avg_state=1: [case.py](case.py). diff --git a/tests/F99FBB36/README.md b/tests/F99FBB36/README.md deleted file mode 100644 index 2cb066dd44..0000000000 --- a/tests/F99FBB36/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/F99FBB36 - -3D -> bc=-4: [case.py](case.py). diff --git a/tests/FB822062/README.md b/tests/FB822062/README.md deleted file mode 100644 index a9096ad07d..0000000000 --- a/tests/FB822062/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/FB822062 - -2D -> Axisymmetric -> Viscous: [case.py](case.py). diff --git a/tests/FBF808BE/README.md b/tests/FBF808BE/README.md deleted file mode 100644 index e5403792d7..0000000000 --- a/tests/FBF808BE/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/FBF808BE - -2D -> 1 Fluid(s) -> riemann_solver=1 -> wave_speeds=2: [case.py](case.py). diff --git a/tests/FC4D07B6/README.md b/tests/FC4D07B6/README.md deleted file mode 100644 index a4b236f213..0000000000 --- a/tests/FC4D07B6/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/FC4D07B6 - -2D -> 2 Fluid(s) -> riemann_solver=2 -> wave_speeds=2: [case.py](case.py). diff --git a/tests/FC5270CE/README.md b/tests/FC5270CE/README.md deleted file mode 100644 index 95d350a8bb..0000000000 --- a/tests/FC5270CE/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/FC5270CE - -2D -> bc=-14: [case.py](case.py). diff --git a/tests/FC5270CE/case.py b/tests/FC5270CE/case.py deleted file mode 100644 index 687c2fb9b4..0000000000 --- a/tests/FC5270CE/case.py +++ /dev/null @@ -1,141 +0,0 @@ -#!/usr/bin/env python3 -# -# tests/FC5270CE/case.py: -# 2D -> bc=-14 - -import json -import argparse - -parser = argparse.ArgumentParser( - prog="tests/FC5270CE/case.py", - description="tests/FC5270CE/case.py: 2D -> bc=-14", - formatter_class=argparse.ArgumentDefaultsHelpFormatter) - -parser.add_argument("dict", type=str, metavar="DICT", help=argparse.SUPPRESS) - -ARGS = vars(parser.parse_args()) - -ARGS["dict"] = json.loads(ARGS["dict"]) - -case = { - "run_time_info": "T", - "m": 49, - "n": 39, - "p": 0, - "dt": 0.0005, - "t_step_start": 0, - "t_step_stop": 50, - "t_step_save": 50, - "num_patches": 3, - "model_eqns": 2, - "alt_soundspeed": "F", - "num_fluids": 1, - "adv_alphan": "T", - "mpp_lim": "F", - "mixture_err": "F", - "time_stepper": 3, - "weno_order": 5, - "weno_eps": 1e-16, - "mapped_weno": "F", - "null_weights": "F", - "mp_weno": "F", - "riemann_solver": 2, - "wave_speeds": 1, - "avg_state": 2, - "format": 1, - "precision": 2, - "prim_vars_wrt": "F", - "parallel_io": "F", - "patch_icpp(1)%pres": 1.0, - "patch_icpp(1)%alpha_rho(1)": 1.0, - "patch_icpp(1)%alpha(1)": 1.0, - "patch_icpp(2)%pres": 0.5, - "patch_icpp(2)%alpha_rho(1)": 0.5, - "patch_icpp(2)%alpha(1)": 1.0, - "patch_icpp(3)%pres": 0.1, - "patch_icpp(3)%alpha_rho(1)": 0.125, - "patch_icpp(3)%alpha(1)": 1.0, - "fluid_pp(1)%gamma": 2.5000000000000004, - "fluid_pp(1)%pi_inf": 0.0, - "bubbles": "F", - "Ca": 0.9769178386380458, - "Web": 13.927835051546392, - "Re_inv": 0.009954269975623245, - "pref": 101325.0, - "rhoref": 1000.0, - "bubble_model": 3, - "polytropic": "T", - "polydisperse": "F", - "thermal": 3, - "R0ref": 1e-05, - "patch_icpp(1)%r0": 1, - "patch_icpp(1)%v0": 0, - "patch_icpp(2)%r0": 1, - "patch_icpp(2)%v0": 0, - "patch_icpp(3)%r0": 1, - "patch_icpp(3)%v0": 0, - "qbmm": "F", - "dist_type": 2, - "poly_sigma": 0.3, - "R0_type": 1, - "sigR": 0.1, - "sigV": 0.1, - "rhoRV": 0.0, - "Monopole": "F", - "num_mono": 1, - "Mono(1)%loc(1)": 0.5, - "Mono(1)%mag": 1.0, - "Mono(1)%length": 0.25, - "Mono(1)%dir": 1.0, - "Mono(1)%npulse": 1, - "Mono(1)%pulse": 1, - "cu_mpi": "F", - "x_domain%beg": 0.0, - "x_domain%end": 1.0, - "y_domain%beg": 0.0, - "y_domain%end": 1.0, - "bc_x%beg": -14, - "bc_x%end": -14, - "bc_y%beg": -14, - "bc_y%end": -14, - "patch_icpp(1)%geometry": 3, - "patch_icpp(1)%y_centroid": 0.05, - "patch_icpp(1)%length_y": 0.1, - "patch_icpp(2)%y_centroid": 0.45, - "patch_icpp(2)%length_y": 0.7, - "patch_icpp(3)%y_centroid": 0.9, - "patch_icpp(3)%length_y": 0.2, - "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(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(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 -} -mods = {} - -if "post_process" in ARGS["dict"]["targets"]: - mods = { - 'parallel_io' : 'T', 'cons_vars_wrt' : 'T', - 'prim_vars_wrt': 'T', 'alpha_rho_wrt(1)': 'T', - 'rho_wrt' : 'T', 'mom_wrt(1)' : 'T', - 'vel_wrt(1)' : 'T', 'E_wrt' : 'T', - 'pres_wrt' : 'T', 'alpha_wrt(1)' : 'T', - 'gamma_wrt' : 'T', 'heat_ratio_wrt' : 'T', - 'pi_inf_wrt' : 'T', 'pres_inf_wrt' : 'T', - 'c_wrt' : 'T', - } - - if case['p'] != 0: - mods['fd_order'] = 1 - mods['omega_wrt'] = 'T' - -print(json.dumps({**case, **mods})) diff --git a/tests/FD891191/README.md b/tests/FD891191/README.md deleted file mode 100644 index ee705faaf0..0000000000 --- a/tests/FD891191/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/FD891191 - -1D -> 2 Fluid(s) -> riemann_solver=2 -> model_eqns=3: [case.py](case.py). diff --git a/tests/FE3E35C4/README.md b/tests/FE3E35C4/README.md deleted file mode 100644 index 04537975a8..0000000000 --- a/tests/FE3E35C4/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# tests/FE3E35C4 - -1D -> Viscosity -> Bubbles -> bubble_model=2: [case.py](case.py). diff --git a/toolchain/mfc/args.py b/toolchain/mfc/args.py index a9984ff2c3..0eb1db3ee8 100644 --- a/toolchain/mfc/args.py +++ b/toolchain/mfc/args.py @@ -1,12 +1,11 @@ import re, os.path, argparse, dataclasses -from .build import TARGETS, DEFAULT_TARGETS, DEPENDENCY_TARGETS -from .common import MFCException, format_list_to_string -from .test.cases import generate_cases -from .run.engines import ENGINES -from .run.mpi_bins import BINARIES +from .run.run import get_baked_templates +from .build import TARGETS, DEFAULT_TARGETS, DEPENDENCY_TARGETS +from .common import MFCException, format_list_to_string +from .test.cases import generate_cases -# pylint: disable=too-many-locals, too-many-statements +# pylint: disable=too-many-locals, too-many-branches, too-many-statements def parse(config): parser = argparse.ArgumentParser( prog="./mfc.sh", @@ -75,8 +74,6 @@ def add_common_arguments(p, mask = None): # === CLEAN === add_common_arguments(clean, "jg") - binaries = [ b.bin for b in BINARIES ] - # === TEST === test_cases = generate_cases() @@ -85,7 +82,6 @@ def add_common_arguments(p, mask = None): 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.") test.add_argument("-a", "--test-all", action="store_true", default=False, help="Run the Post Process Tests too.") test.add_argument("-%", "--percent", type=int, default=100, help="Percentage of tests to run.") @@ -98,29 +94,31 @@ def add_common_arguments(p, mask = None): test_meg.add_argument("--add-new-variables", action="store_true", default=False, help="(Test Generation) If new variables are found in D/ when running tests, add them to the golden files.") test_meg.add_argument("--remove-old-tests", action="store_true", default=False, help="(Test Generation) Delete tests directories that are no longer.") - # === RUN === - engines = [ e.slug for e in ENGINES ] + test.add_argument(metavar="FORWARDED", default=[], dest="--", nargs="*", help="Arguments to forward to the ./mfc.sh run invocations.") + # === RUN === add_common_arguments(run) - run.add_argument("input", metavar="INPUT", type=str, help="Input file to run.") - run.add_argument("arguments", metavar="ARGUMENTS", nargs='*', type=str, default=[], help="Additional arguments to pass to the case file.") - run.add_argument("-e", "--engine", choices=engines, type=str, default=engines[0], help="Job execution/submission engine choice.") - run.add_argument("-p", "--partition", metavar="PARTITION", type=str, default="", help="(Batch) Partition for job submission.") - run.add_argument("-N", "--nodes", metavar="NODES", type=int, default=1, help="(Batch) Number of nodes.") - run.add_argument("-n", "--tasks-per-node", metavar="TASKS", type=int, default=1, help="Number of tasks per node.") - run.add_argument("-w", "--walltime", metavar="WALLTIME", type=str, default="01:00:00", help="(Batch) Walltime.") - run.add_argument("-a", "--account", metavar="ACCOUNT", type=str, default="", help="(Batch) Account to charge.") - run.add_argument("-@", "--email", metavar="EMAIL", type=str, default="", help="(Batch) Email for job notification.") - run.add_argument("-#", "--name", metavar="NAME", type=str, default="MFC", help="(Batch) Job name.") - run.add_argument("-f", "--flags", metavar="FLAGS", nargs='+', type=str, default=[], help="(Batch) Additional batch options.") - run.add_argument("-b", "--binary", choices=binaries, type=str, default=None, help="(Interactive) Override MPI execution binary") - run.add_argument("-s", "--scratch", action="store_true", default=False, help="Build from scratch.") - run.add_argument("--ncu", nargs=argparse.REMAINDER, type=str, help="Profile with NVIDIA Nsight Compute.") - run.add_argument("--nsys", nargs=argparse.REMAINDER, type=str, help="Profile with NVIDIA Nsight Systems.") - run.add_argument( "--dry-run", action="store_true", default=False, help="(Batch) Run without submitting batch file.") - run.add_argument("--case-optimization", action="store_true", default=False, help="(GPU Optimization) Compile MFC targets with some case parameters hard-coded.") - run.add_argument( "--no-build", action="store_true", default=False, help="(Testing) Do not rebuild MFC.") - run.add_argument("--wait", action="store_true", default=False, help="(Batch) Wait for the job to finish.") + run.add_argument("input", metavar="INPUT", type=str, help="Input file to run.") + run.add_argument("arguments", metavar="ARGUMENTS", nargs="*", type=str, default=[], help="Additional positional arguments to pass to the case file.") + run.add_argument("-e", "--engine", choices=["interactive", "batch"], type=str, default="interactive", help="Job execution/submission engine choice.") + run.add_argument("-p", "--partition", metavar="PARTITION", type=str, default="", help="(Batch) Partition for job submission.") + run.add_argument("-q", "--quality_of_service", metavar="QOS", type=str, default="", help="(Batch) Quality of Service for job submission.") + run.add_argument("-N", "--nodes", metavar="NODES", type=int, default=1, help="(Batch) Number of nodes.") + run.add_argument("-n", "--tasks-per-node", metavar="TASKS", type=int, default=1, help="Number of tasks per node.") + run.add_argument("-w", "--walltime", metavar="WALLTIME", type=str, default="01:00:00", help="(Batch) Walltime.") + run.add_argument("-a", "--account", metavar="ACCOUNT", type=str, default="", help="(Batch) Account to charge.") + run.add_argument("-@", "--email", metavar="EMAIL", type=str, default="", help="(Batch) Email for job notification.") + run.add_argument("-#", "--name", metavar="NAME", type=str, default="MFC", help="(Batch) Job name.") + run.add_argument("-s", "--scratch", action="store_true", default=False, help="Build from scratch.") + run.add_argument("-b", "--binary", choices=["mpirun", "jsrun", "srun", "mpiexec"], type=str, default=None, help="(Interactive) Override MPI execution binary") + run.add_argument("--ncu", nargs=argparse.REMAINDER, type=str, help="Profile with NVIDIA Nsight Compute.") + run.add_argument("--nsys", nargs=argparse.REMAINDER, type=str, help="Profile with NVIDIA Nsight Systems.") + run.add_argument( "--dry-run", action="store_true", default=False, help="(Batch) Run without submitting batch file.") + run.add_argument("--case-optimization", action="store_true", default=False, help="(GPU Optimization) Compile MFC targets with some case parameters hard-coded.") + run.add_argument( "--no-build", action="store_true", default=False, help="(Testing) Do not rebuild MFC.") + run.add_argument("--wait", action="store_true", default=False, help="(Batch) Wait for the job to finish.") + run.add_argument("-f", "--flags", metavar="FLAGS", dest="--", nargs=argparse.REMAINDER, type=str, default=[], help="Arguments to forward to the MPI invocation.") + run.add_argument("-c", "--computer", metavar="COMPUTER", type=str, default="default", help=f"(Batch) Path to a custom submission file template or one of {format_list_to_string(list(get_baked_templates().keys()))}.") # === BENCH === add_common_arguments(bench, "t") @@ -129,6 +127,7 @@ def add_common_arguments(p, mask = None): add_common_arguments(count, "g") args: dict = vars(parser.parse_args()) + args["--"] = args.get("--", []) # Add default arguments of other subparsers for name, parser in [("run", run), ("test", test), ("build", build), @@ -150,10 +149,14 @@ def add_common_arguments(p, mask = None): # "Slugify" the name of the job args["name"] = re.sub(r'[\W_]+', '-', args["name"]) - # build's --case-optimization and --input depend on each other + # We need to check for some invalid combinations of arguments because of + # the limitations of argparse. if args["command"] == "build": if (args["input"] is not None) ^ args["case_optimization"] : - raise MFCException("./mfc.sh build's --case-optimization requires --input") + raise MFCException("./mfc.sh build's --case-optimization and --input must be used together.") + if args["command"] == "run": + if args["binary"] is not None and args["engine"] != "interactive": + raise MFCException("./mfc.sh run's --binary can only be used with --engine=interactive.") # Input files to absolute paths for e in ["input", "input1", "input2"]: diff --git a/toolchain/mfc/build.py b/toolchain/mfc/build.py index 2458a9a358..ee827dec1e 100644 --- a/toolchain/mfc/build.py +++ b/toolchain/mfc/build.py @@ -1,8 +1,10 @@ import os, typing, hashlib, dataclasses -from .common import MFCException, system, delete_directory, create_directory -from .state import ARG, CFG -from .run import input +from .printer import cons +from .common import MFCException, system, delete_directory, create_directory, \ + format_list_to_string +from .state import ARG, CFG +from .run import input @dataclasses.dataclass class MFCTarget: @@ -31,19 +33,18 @@ def __hash__(self) -> int: # Get path to directory that will store the build files def get_build_dirpath(self) -> str: - subdir = 'dependencies' if self.isDependency else CFG().make_slug() + if self.isDependency: + slug = self.name + else: + slug = f"{CFG().make_slug()}-{self.name}" - if not self.isDependency and ARG("case_optimization"): - m = hashlib.sha256() - m.update(input.load().get_fpp(self).encode()) - subdir = f"{subdir}-{m.hexdigest()[:6]}" + if ARG("case_optimization"): + m = hashlib.sha256() + m.update(input.load().get_fpp(self).encode()) - return os.sep.join([ - os.getcwd(), - "build", - subdir, - self.name - ]) + slug = f"{slug}-{m.hexdigest()[:6]}" + + return os.sep.join([os.getcwd(), "build", slug ]) # Get the directory that contains the target's CMakeLists.txt def get_cmake_dirpath(self) -> str: @@ -143,9 +144,13 @@ def configure(self): delete_directory(build_dirpath) create_directory(build_dirpath) - if system(command, no_exception=True) != 0: + input.load({}).generate_fpp(self) + + if system(command).returncode != 0: raise MFCException(f"Failed to configure the [bold magenta]{self.name}[/bold magenta] target.") + cons.print(no_indent=True) + def build(self): input.load({}).generate_fpp(self) @@ -156,12 +161,18 @@ def build(self): if ARG('verbose'): command.append("--verbose") - system(command, exception_text=f"Failed to build the [bold magenta]{self.name}[/bold magenta] target.") + if system(command).returncode != 0: + raise MFCException(f"Failed to build the [bold magenta]{self.name}[/bold magenta] target.") + + cons.print(no_indent=True) def install(self): command = ["cmake", "--install", self.get_build_dirpath()] - system(command, exception_text=f"Failed to install the [bold magenta]{self.name}[/bold magenta] target.") + if system(command).returncode != 0: + raise MFCException(f"Failed to install the [bold magenta]{self.name}[/bold magenta] target.") + + cons.print(no_indent=True) def clean(self): build_dirpath = self.get_build_dirpath() @@ -175,7 +186,8 @@ def clean(self): if ARG("verbose"): command.append("--verbose") - system(command, exception_text=f"Failed to clean the [bold magenta]{self.name}[/bold magenta] target.") + if system(command).returncode != 0: + raise MFCException(f"Failed to clean the [bold magenta]{self.name}[/bold magenta] target.") FFTW = MFCTarget('fftw', ['-DMFC_FFTW=ON'], True, False, False, MFCTarget.Dependencies([], [], []), -1) @@ -205,6 +217,10 @@ def get_target(target: typing.Union[str, MFCTarget]) -> MFCTarget: raise MFCException(f"Target '{target}' does not exist.") +def get_targets(targets: typing.List[typing.Union[str, MFCTarget]]) -> typing.List[MFCTarget]: + return [ get_target(t) for t in targets ] + + def get_dependency_install_dirpath() -> str: # Since dependencies share the same install directory, we can just return # the install directory of the first dependency we find. @@ -215,64 +231,69 @@ def get_dependency_install_dirpath() -> str: raise MFCException("No dependency target found.") -def build_target(target: typing.Union[MFCTarget, str], history: typing.Set[str] = None): +def __build_target(target: typing.Union[MFCTarget, str], history: typing.Set[str] = None): if history is None: history = set() - t = get_target(target) + target = get_target(target) - if t.name in history or not t.is_buildable(): + if target.name in history or not target.is_buildable(): return - history.add(t.name) + history.add(target.name) - build_targets(t.requires.compute(), history) + build(target.requires.compute(), history) - if not t.is_configured(): - t.configure() + if not target.is_configured(): + target.configure() - t.build() - t.install() - -def build_targets(targets: typing.Iterable[typing.Union[MFCTarget, str]], history: typing.Set[str] = None): - if history is None: - history = set() - - for target in list(REQUIRED_TARGETS) + targets: - build_target(target, history) + target.build() + target.install() -def clean_target(target: typing.Union[MFCTarget, str], history: typing.Set[str] = None): - if history is None: - history = set() +def get_configured_targets() -> typing.List[MFCTarget]: + return [ target for target in TARGETS if target.is_configured() ] - t = get_target(target) - if t.name in history or not t.is_buildable(): - return +def __generate_header(step_name: str, targets: typing.List): + caseopt_info = "Generic Build" + if ARG("case_optimization"): + caseopt_info = f"Case Optimized for [magenta]{ARG('input')}[/magenta]" - history.add(t.name) + targets = get_targets(targets) + target_list = format_list_to_string([ t.name for t in targets ], 'magenta') - t.clean() + return f"[bold]{step_name} | {target_list} | {caseopt_info}[/bold]" -def clean_targets(targets: typing.Iterable[typing.Union[MFCTarget, str]], history: typing.Set[str] = None): +def build(targets = None, history: typing.Set[str] = None): if history is None: history = set() + if targets is None: + targets = ARG("targets") - for target in list(REQUIRED_TARGETS) + targets: - t = get_target(target) - if t.is_configured(): - t.clean() + targets = get_targets(list(REQUIRED_TARGETS) + targets) + if len(history) == 0: + cons.print(__generate_header("Build", targets)) + cons.print(no_indent=True) + + for target in targets: + __build_target(target, history) + + if len(history) == 0: + cons.print(no_indent=True) -def get_configured_targets() -> typing.List[MFCTarget]: - return [ target for target in TARGETS if target.is_configured() ] +def clean(targets = None): + targets = get_targets(list(REQUIRED_TARGETS) + (targets or ARG("targets"))) -def build(): - build_targets(ARG("targets")) + cons.print(__generate_header("Clean", targets)) + cons.print(no_indent=True) + for target in targets: + if target.is_configured(): + target.clean() -def clean(): - clean_targets(ARG("targets")) + cons.print(no_indent=True) + cons.unindent() diff --git a/toolchain/mfc/common.py b/toolchain/mfc/common.py index 4c4347802a..b51f7d5416 100644 --- a/toolchain/mfc/common.py +++ b/toolchain/mfc/common.py @@ -5,9 +5,10 @@ from .printer import cons -MFC_ROOTDIR = normpath(f"{dirname(realpath(__file__))}/../..") +MFC_ROOTDIR = abspath(normpath(f"{dirname(realpath(__file__))}/../..")) MFC_TESTDIR = abspath(f"{MFC_ROOTDIR}/tests") MFC_SUBDIR = abspath(f"{MFC_ROOTDIR}/build") +MFC_TEMPLATEDIR = abspath(f"{MFC_ROOTDIR}/toolchain/templates") MFC_LOCK_FILEPATH = abspath(f"{MFC_SUBDIR}/lock.yaml") MFC_BENCH_FILEPATH = abspath(f"{MFC_ROOTDIR}/toolchain/bench.yaml") @@ -28,33 +29,14 @@ class MFCException(Exception): pass -# pylint: disable=too-many-arguments -def system(command: typing.List[str], no_exception: bool = False, exception_text=None, on_error=lambda: None, cwd=None, stdout=None, stderr=None, env: dict = None) -> int: +def system(command: typing.List[str], print_cmd = None, **kwargs) -> subprocess.CompletedProcess: cmd = [ str(x) for x in command if not isspace(str(x)) ] - if env is None: - env = os.environ.copy() - - if stdout != subprocess.DEVNULL: - cons.print(no_indent=True) - - cons.print(f"$ {' '.join(cmd)}") - - if stdout != subprocess.DEVNULL: + if print_cmd in [True, None]: + cons.print(f"$ {' '.join(cmd)}") cons.print(no_indent=True) - r = subprocess.run(cmd, cwd=cwd, stdout=stdout, stderr=stderr, env=env, check=False) - - if r.returncode != 0: - on_error() - - if not no_exception: - if exception_text is None: - exception_text = f'Failed to execute command "{command}".' - - raise MFCException(exception_text) - - return r.returncode + return subprocess.run(cmd, **kwargs, check=False) def file_write(filepath: str, content: str): @@ -198,14 +180,6 @@ def does_system_use_modules() -> bool: return does_command_exist("module") -def get_loaded_modules() -> typing.List[str]: - """ - Returns a list of loaded modules. - """ - - return [ l for l in subprocess.getoutput("module -t list").splitlines() if ' ' not in l ] - - def is_number(x: str) -> bool: if x is None: return False diff --git a/toolchain/mfc/printer.py b/toolchain/mfc/printer.py index dbbd0267bd..e74d8ec01c 100644 --- a/toolchain/mfc/printer.py +++ b/toolchain/mfc/printer.py @@ -28,14 +28,14 @@ def print(self, *args, msg: typing.Any = None, no_indent: bool = False, **kwargs msg = "" if no_indent: - self.raw.print(str(msg), *args, **kwargs) + self.raw.print(str(msg), soft_wrap=True, *args, **kwargs) else: print_s, lines = "", str(msg).split('\n', maxsplit=-1) for i, s in enumerate(lines): newline = '\n' if (i != len(lines)-1) else '' print_s += f"{''.join(self.stack)}{s}{newline}" - self.raw.print(print_s, *args, **kwargs) + self.raw.print(print_s, soft_wrap=True, *args, **kwargs) def print_exception(self): self.raw.print_exception() diff --git a/toolchain/mfc/run/engines.py b/toolchain/mfc/run/engines.py deleted file mode 100644 index 7ca4c67e5c..0000000000 --- a/toolchain/mfc/run/engines.py +++ /dev/null @@ -1,343 +0,0 @@ -import re, os, time, copy, typing, datetime, subprocess, dataclasses, multiprocessing - -from ..state import ARG, ARGS -from ..printer import cons -from ..build import MFCTarget, SYSCHECK -from ..common import MFCException, does_command_exist, isspace, system -from ..common import format_list_to_string, does_system_use_modules -from ..common import get_loaded_modules, file_write -from ..run import queues, mpi_bins -from ..run.input import MFCInputFile - - -def profiler_prepend(): - if ARG("ncu") is not None: - if not does_command_exist("ncu"): - raise MFCException("Failed to locate [bold green]NVIDIA Nsight Compute[/bold green] (ncu).") - - return ["ncu", "--nvtx", "--mode=launch-and-attach", - "--cache-control=none", "--clock-control=none"] + ARG("ncu") - - if ARG("nsys") is not None: - if not does_command_exist("nsys"): - raise MFCException("Failed to locate [bold green]NVIDIA Nsight Systems[/bold green] (nsys).") - - return ["nsys", "profile", "--stats=true", "--trace=mpi,nvtx,openacc"] + ARG("nsys") - - return [] - - -@dataclasses.dataclass(init=False) -class Engine: - name: str - slug: str - input: MFCInputFile - - 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() - - def _init(self) -> None: - pass - - def get_args(self) -> typing.List[str]: - raise MFCException(f"MFCEngine::get_args: not implemented for {self.name}.") - - def run(self, targets: typing.List[MFCTarget]) -> None: - raise MFCException(f"MFCEngine::run: not implemented for {self.name}.") - - -def _interactive_working_worker(cmd: typing.List[str], q: multiprocessing.Queue): - """ Runs a command and puts the result in a queue. """ - cmd = [ str(_) for _ in cmd ] - cons.print(f"$ {' '.join(cmd)}") - result = subprocess.run( - 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() - - # If using MPI, we don't know yet whether this engine works - self.bKnowWorks = not ARG("mpi") - - def get_args(self) -> str: - return f"""\ -Nodes (-N) {ARG('nodes')} -Tasks (/node) (-n) {ARG('tasks_per_node')} -MPI Binary (-b) {self.mpibin.bin}\ -""" - - def get_exec_cmd(self, target: MFCTarget) -> typing.List[str]: - cmd = [] - if ARG("mpi"): - cmd += [self.mpibin.bin] + self.mpibin.gen_params() + ARG("flags")[:] - - cmd += profiler_prepend() - - cmd.append(target.get_install_binpath()) - - return cmd - - - def run(self, targets: typing.List[MFCTarget]) -> None: - if not self.bKnowWorks: - # Fix MFlowCode/MFC#21: Check whether attempting to run a job will hang - # forever. This can happen when using the wrong queue system. - - work_timeout = 30 - - cons.print(f"Ensuring the [bold magenta]Interactive Engine[/bold magenta] works ({work_timeout}s timeout) via [bold magenta]syscheck[/bold magenta]:") - cons.print() - cons.indent() - - q = multiprocessing.Queue() - p = multiprocessing.Process( - target=_interactive_working_worker, - args=( - [self.mpibin.bin] + self.mpibin.gen_params() + [os.sep.join([SYSCHECK.get_install_dirpath(), "bin", "syscheck"])], - q, - )) - - p.start() - p.join(work_timeout) - - if p.is_alive(): - raise MFCException("""\ -The [bold magenta]Interactive Engine[/bold magenta] appears to hang. -This may indicate that the wrong MPI binary is being used to launch parallel jobs. You can specify the correct one for your system -using the <-b,--binary> option. For example: -* ./mfc.sh run -b mpirun -* ./mfc.sh run -b srun -""") - - result = q.get(block=False) - self.bKnowWorks = result.returncode == 0 - - if not self.bKnowWorks: - error_txt = """\ -MFC's [bold magenta]syscheck[/bold magenta] (system check) failed to run successfully. -Please review the output bellow and ensure that your system is configured correctly: - -""" - - if result is not None: - error_txt += f"""\ -STDOUT: -{result.stdout} - -STDERR: -{result.stderr} -""" - else: - error_txt += f"Evaluation timed out after {work_timeout}s." - - raise MFCException(error_txt) - - cons.print() - cons.unindent() - - for target in targets: - cons.print(f"[bold]Running [magenta]{target.name}[/magenta][/bold]:") - cons.indent() - - if not ARG("dry_run"): - start_time = time.monotonic() - env = os.environ.copy() - if ARG('gpus') is not None: - env['CUDA_VISIBLE_DEVICES'] = ','.join([str(_) for _ in ARG('gpus')]) - - system( - self.get_exec_cmd(target), cwd=self.input.case_dirpath, - env=env - ) - end_time = time.monotonic() - cons.print(no_indent=True) - - cons.print(f"[bold green]Done[/bold green] (in {datetime.timedelta(seconds=end_time - start_time)})") - - cons.print() - cons.unindent() - - -class BatchEngine(Engine): - def __init__(self) -> None: - super().__init__("Batch", "batch") - - def get_args(self) -> str: - return f"""\ -Nodes (-N) {ARG('nodes')} -Tasks (/node) (-n) {ARG('tasks_per_node')} -Walltime (-w) {ARG("walltime")} -Partition (-p) {ARG("partition")} -Account (-a) {ARG("account")} -Email (-@) {ARG("email")} -""" - - def run(self, targets: typing.List[MFCTarget]) -> None: - 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(qsystem, targets) - - if not ARG("dry_run"): - 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.") - cons.print("[bold yellow]INFO:[/bold yellow] You can modify the template batch file to your needs.") - - cons.unindent() - - def __get_batch_dirpath(self) -> str: - return copy.copy(self.input.case_dirpath) - - def __get_batch_filename(self) -> str: - return f"{ARG('name')}.sh" - - def __get_batch_filepath(self): - return os.path.abspath(os.sep.join([ - self.__get_batch_dirpath(), - self.__get_batch_filename() - ])) - - def __generate_prologue(self, qsystem: queues.QueueSystem) -> str: - modules = f"" - - if does_system_use_modules(): - modules = f"""\ -printf ":) Loading modules...\\n" - -module purge -module load {' '.join(get_loaded_modules())} -""" - - return f"""\ -TABLE_FORMAT_LINE="| - %-14s %-35s - %-14s %-35s |\\n" -TABLE_HEADER="+-----------------------------------------------------------------------------------------------------------+ \\n" -TABLE_FOOTER="+-----------------------------------------------------------------------------------------------------------+ \\n" -TABLE_TITLE_FORMAT="| %8s %-96s |\\n" -TABLE_CONTENT=$(cat <<-END -$(printf "$TABLE_FORMAT_LINE" "Start-time:" "$(date +%T)" "Start-date:" "$(date +%T)") -$(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:" "{qsystem.name}" "Email:" "{ARG("email")}") -END -) - -printf "$TABLE_HEADER" -printf "$TABLE_TITLE_FORMAT" "Starting" "{ARG("name")} from {ARG("input")}:" -printf "$TABLE_CONTENT\\n" -printf "$TABLE_FOOTER\\n" - -{modules} - -cd "{self.input.case_dirpath}" - -t_start=$(date +%s) -""" - - def __generate_epilogue(self) -> str: - return f"""\ -code=$? - -t_stop="$(date +%s)" - -printf "\\n$TABLE_HEADER" -printf "$TABLE_TITLE_FORMAT" "Finished" "{ARG("name")}:" -printf "$TABLE_FORMAT_LINE" "Total-time:" "$(expr $t_stop - $t_start)s" "Exit Code:" "$code" -printf "$TABLE_FORMAT_LINE" "End-time:" "$(date +%T)" "End-date:" "$(date +%T)" -printf "$TABLE_FOOTER" - -exit $code -""" - - 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.") from exc - - def __batch_evaluate(self, s: str, qsystem: queues.QueueSystem, targets: typing.List[MFCTarget]): - replace_list = [ - ("{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])), - ] - - for (key, value) in replace_list: - s = s.replace(key, value) - - # Remove "#>" comments & redundant newlines - s = re.sub(r"^#>.*\n", "", s, flags=re.MULTILINE) - s = re.sub(r"^\n{2,}", "\n", s, flags=re.MULTILINE) - - # Evaluate expressions of the form "{expression}" - for match in re.findall(r"{[^\{]+}", s, flags=re.MULTILINE): - repl = self.__evaluate_expression(match[1:-1]) - - if repl is not None: - s = s.replace(match, repl) - else: - # If not specified, then remove the line it appears on - s = re.sub(rf"^.*{match}.*$\n", "", s, flags=re.MULTILINE) - - cons.print(f"> > [bold yellow]Warning:[/bold yellow] [magenta]{match[1:-1]}[/magenta] was not specified. Thus, any line it appears on will be discarded.") - - return s - - 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(qsystem.template, qsystem, targets) - - cons.print("> Writing batch file...") - file_write(filepath, content) - - 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 = qsystem.gen_submit_cmd(self.__get_batch_filename()) - - if system(cmd, cwd=self.__get_batch_dirpath()) != 0: - 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() ] - -def get_engine(slug: str) -> Engine: - engine: Engine = None - for candidate in ENGINES: - candidate: Engine - - if candidate.slug == slug: - engine = candidate - break - - if engine is None: - raise MFCException(f"Unsupported engine {slug}.") - - return engine diff --git a/toolchain/mfc/run/input.py b/toolchain/mfc/run/input.py index 2a2cf8fa06..a0f95bc002 100644 --- a/toolchain/mfc/run/input.py +++ b/toolchain/mfc/run/input.py @@ -30,6 +30,8 @@ def __is_ic_analytical(self, key: str, val: str) -> bool: return False def generate_inp(self, target) -> None: + target = build.get_target(target) + cons.print(f"Generating [magenta]{target.name}.inp[/magenta]:") cons.indent() @@ -72,10 +74,10 @@ def __contents_equal(str_a: str, str_b: str) -> bool: return lhs == rhs - inc_dir = os.path.join(target.get_build_dirpath(), "include") + inc_dir = os.path.join(target.get_build_dirpath(), "include", target.name) common.create_directory(inc_dir) - fpp_path = os.path.join(inc_dir, f"case.fpp") + fpp_path = os.path.join(inc_dir, "case.fpp") opt_fpp = common.file_read(fpp_path) if os.path.exists(fpp_path) else "" if __contents_equal(contents, opt_fpp): @@ -210,7 +212,10 @@ def _default() -> str: return result def generate_fpp(self, target) -> None: - cons.print(f"Generating [magenta]{build.get_target(target).name}/include/case.fpp[/magenta].") + if target.isDependency: + return + + cons.print(f"Generating [magenta]case.fpp[/magenta].") cons.indent() self.__save_fpp(target, self.get_fpp(target)) diff --git a/toolchain/mfc/run/mpi_bins.py b/toolchain/mfc/run/mpi_bins.py deleted file mode 100644 index 2d39a4fd0f..0000000000 --- a/toolchain/mfc/run/mpi_bins.py +++ /dev/null @@ -1,120 +0,0 @@ -import typing, dataclasses - -from .. import common -from ..state import ARG - -# Note: This file is now only used when running -# in -e interactive mode. - -@dataclasses.dataclass -class MPIBinary: - name: str - bin: str - - def is_present(self) -> bool: - return common.does_command_exist(self.bin) - - def gen_params(self) -> typing.List[str]: - raise common.MFCException(f"MPIBinary::gen_params <{self.name}> not implemented.") - - -class NOMPIBIN(MPIBinary): - def __init__(self): - super().__init__("N/A", "N/A") - - def is_present(self) -> bool: - return not ARG("mpi") - - def gen_params(self) -> typing.List[str]: - return [] - - -class JSRUN(MPIBinary): - def __init__(self): - super().__init__("IBM's JSRUN", "jsrun") - - def gen_params(self) -> typing.List[str]: - # ORNL Summit: https://docs.olcf.ornl.gov/systems/summit_user_guide.html?highlight=lsf#launching-a-job-with-jsrun - # We create one resource-set per CPU(Core)/GPU pair. - nrs=ARG("tasks_per_node")*ARG("nodes") - cores_per_rs=1 - gpus_per_rs=min(ARG("tasks_per_node"), 1) - tasks_per_rs=1 - - arguments=[ - '--nrs', nrs, - '--cpu_per_rs', cores_per_rs, - '--gpu_per_rs', gpus_per_rs, - '--tasks_per_rs', tasks_per_rs - ] - - if gpus_per_rs >= 1: - arguments.append('--smpiargs=-gpu') - - return arguments - - -class SRUN(MPIBinary): - def __init__(self): - super().__init__("SLURM's SRUN", "srun") - - def gen_params(self) -> typing.List[str]: - params = ['--ntasks-per-node', ARG("tasks_per_node")] - - if ARG("nodes") != 1: - params += ['-N', ARG("nodes")] - - # MFC binds its GPUs on its own, as long as they have been allocated - # by the system's scheduler, or are present on your local machine, - # if running in serial mode. - - if not common.isspace(ARG("account")): - params += ['-A', ARG("account")] - - if not common.isspace(ARG("partition")): - params += ['-p', ARG("partition")] - - return params - - -class MPIEXEC(MPIBinary): - def __init__(self): - super().__init__("MPIEXEC", "mpiexec") - - def gen_params(self) -> str: - return ["-np", ARG("tasks_per_node")*ARG("nodes")] - - -class MPIRUN(MPIBinary): - def __init__(self): - super().__init__("MPIRUN", "mpirun") - - def gen_params(self) -> str: - return ["-np", ARG("tasks_per_node")*ARG("nodes")] - - -# In descending order of priority (if no override present) -BINARIES: list = [ JSRUN(), SRUN(), MPIRUN(), MPIEXEC(), NOMPIBIN() ] - -def get_binary(exclude: typing.List[str] = None) -> MPIBinary: - if exclude is None: - exclude = [] - - binaries = [ - b for b in BINARIES if b.is_present() and b.bin not in exclude - ] - - if len(binaries) == 0: - raise common.MFCException("No MPI binary found.") - - # Handle user override - if ARG("binary") is not None: - for binary in binaries: - binary: MPIBinary - - if binary.bin == ARG("binary"): - return binary - - raise common.MFCException(f"MPI Binary <{ARG('binary')}> not found.") - - return binaries[0] diff --git a/toolchain/mfc/run/queues.py b/toolchain/mfc/run/queues.py index acb833888c..bb8a17b453 100644 --- a/toolchain/mfc/run/queues.py +++ b/toolchain/mfc/run/queues.py @@ -1,16 +1,15 @@ -import os, typing, dataclasses +import typing, dataclasses -from mfc import common +from mfc import common from ..state import ARG + @dataclasses.dataclass class QueueSystem: - name: str - template: str + name: str - def __init__(self, name: str, filename: str) -> None: - self.name = name - self.template = common.file_read(os.sep.join(["toolchain", "templates", filename])) + def __init__(self, name: str) -> None: + self.name = name def is_active(self) -> bool: raise common.MFCException("QueueSystem::is_active: not implemented.") @@ -19,9 +18,20 @@ def gen_submit_cmd(self, filepath: str) -> typing.List[str]: raise common.MFCException("QueueSystem::gen_submit_cmd: not implemented.") +class InteractiveSystem(QueueSystem): + def __init__(self) -> None: + super().__init__("Interactive") + + def is_active(self) -> bool: + return True + + def gen_submit_cmd(self, filepath: str) -> typing.List[str]: + return ["/bin/bash", filepath] + + class PBSSystem(QueueSystem): def __init__(self) -> None: - super().__init__("PBS", "pbs.sh") + super().__init__("PBS") def is_active(self) -> bool: return common.does_command_exist("qsub") @@ -35,7 +45,7 @@ def gen_submit_cmd(self, filepath: str) -> typing.List[str]: class LSFSystem(QueueSystem): def __init__(self) -> None: - super().__init__("LSF", "lsf.sh") + super().__init__("LSF") def is_active(self) -> bool: return common.does_command_exist("bsub") and common.does_command_exist("bqueues") @@ -51,7 +61,7 @@ def gen_submit_cmd(self, filepath: str) -> None: class SLURMSystem(QueueSystem): def __init__(self) -> None: - super().__init__("SLURM", "slurm.sh") + super().__init__("SLURM") def is_active(self) -> bool: return common.does_command_exist("sbatch") @@ -65,11 +75,14 @@ def gen_submit_cmd(self, filepath: str) -> None: return cmd + [filepath] -QUEUE_SYSTEMS = [ LSFSystem(), SLURMSystem(), PBSSystem() ] +BATCH_SYSTEMS = [ LSFSystem(), SLURMSystem(), PBSSystem() ] def get_system() -> QueueSystem: - for system in QUEUE_SYSTEMS: + if ARG("engine") == "interactive": + return InteractiveSystem() + + for system in BATCH_SYSTEMS: if system.is_active(): return system - raise common.MFCException("Failed to detect a queue system.") + raise common.MFCException(f"Failed to detect a queue system for engine [magenta]{ARG('engine')}[/magenta].") diff --git a/toolchain/mfc/run/run.py b/toolchain/mfc/run/run.py index 10a86b6751..9b81121d87 100644 --- a/toolchain/mfc/run/run.py +++ b/toolchain/mfc/run/run.py @@ -1,14 +1,21 @@ -import re, typing +import re, os, typing -from ..build import MFCTarget, get_target, build_targets +from glob import glob + +from mako.lookup import TemplateLookup +from mako.template import Template + +from ..build import get_targets, build from ..printer import cons -from ..state import ARG -from ..common import MFCException, isspace +from ..state import ARG, ARGS +from ..common import MFCException, isspace, file_read, does_command_exist +from ..common import MFC_TEMPLATEDIR, file_write, system, MFC_ROOTDIR +from ..common import format_list_to_string -from . import engines, input +from . import queues, input -def validate_job_options() -> None: +def __validate_job_options() -> None: if not ARG("mpi") and any({ARG("nodes") > 1, ARG("tasks_per_node") > 1}): raise MFCException("RUN: Cannot run on more than one rank with --no-mpi.") @@ -24,30 +31,73 @@ def validate_job_options() -> None: raise MFCException(f'RUN: {ARG("email")} is not a valid e-mail address.') -def run_targets(targets: typing.List[MFCTarget]): - cons.print("[bold]Run[/bold]") - cons.indent() +def __profiler_prepend() -> typing.List[str]: + if ARG("ncu") is not None: + if not does_command_exist("ncu"): + raise MFCException("Failed to locate [bold green]NVIDIA Nsight Compute[/bold green] (ncu).") - if len(targets) == 0: - cons.print(f"> No target selected.") - return + return ["ncu", "--nvtx", "--mode=launch-and-attach", + "--cache-control=none", "--clock-control=none"] + ARG("ncu") - input_file = input.load() + if ARG("nsys") is not None: + if not does_command_exist("nsys"): + raise MFCException("Failed to locate [bold green]NVIDIA Nsight Systems[/bold green] (nsys).") - engine = engines.get_engine(ARG("engine")) - engine.init(input_file) + return ["nsys", "profile", "--stats=true", "--trace=mpi,nvtx,openacc"] + ARG("nsys") - cons.print(f"Configuration:") - cons.indent() - cons.print(f"""\ -Input {ARG('input')} -Job Name (-#) {ARG('name')} -Engine (-e) {ARG('engine')} -{engine.get_args()}\ -""") - cons.unindent() + return [] + + +def get_baked_templates() -> dict: + return { + os.path.splitext(os.path.basename(f))[0] : file_read(f) + for f in glob(os.path.join(MFC_TEMPLATEDIR, "*.mako")) + } + + +def __job_script_filepath() -> str: + return os.path.abspath(os.sep.join([ + os.path.dirname(ARG("input")), + f"{ARG('name')}.sh" + ])) + + +def __get_template() -> Template: + computer = ARG("computer") + lookup = TemplateLookup(directories=[MFC_TEMPLATEDIR, os.path.join(MFC_TEMPLATEDIR, "include")]) + baked = get_baked_templates() + + if (content := baked.get(computer)) is not None: + cons.print(f"Using baked-in template for [magenta]{computer}[/magenta].") + return Template(content, lookup=lookup) + + if os.path.isfile(computer): + cons.print(f"Using template from [magenta]{computer}[/magenta].") + return Template(file_read(computer), lookup=lookup) - validate_job_options() + raise MFCException(f"Failed to find a template for --computer '{computer}'. Baked-in templates are: {format_list_to_string(list(baked.keys()), 'magenta')}.") + + +def __generate_job_script(targets): + env = {} + if ARG('gpus') is not None: + env['CUDA_VISIBLE_DEVICES'] = ','.join([str(_) for _ in ARG('gpus')]) + + content = __get_template().render( + **ARGS(), + ARG=ARG, + env=env, + rootdir=MFC_ROOTDIR, + qsystem=queues.get_system(), + binpaths=[target.get_install_binpath() for target in targets], + profiler=__profiler_prepend(), + ) + + file_write(__job_script_filepath(), content) + + +def __generate_input_files(targets): + input_file = input.load() for target in targets: cons.print(f"Generating input files for [magenta]{target.name}[/magenta]...") @@ -57,13 +107,31 @@ def run_targets(targets: typing.List[MFCTarget]): cons.print() cons.unindent() - build_targets(targets) - engine.run(targets) +def __execute_job_script(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 = qsystem.gen_submit_cmd(__job_script_filepath()) + + if system(cmd, cwd=os.path.dirname(ARG("input"))).returncode != 0: + raise MFCException(f"Submitting batch file for {qsystem.name} failed. It can be found here: {__job_script_filepath()}. Please check the file for errors.") + + +def run(targets = None): + targets = get_targets(targets or ARG("targets")) + + build(targets) + + cons.print("[bold]Run[/bold]") + cons.indent() -def run_target(target: MFCTarget): - run_targets([target]) + qsystem = queues.get_system() + cons.print(f"Using queue system [magenta]{qsystem.name}[/magenta].") + __generate_job_script(targets) + __validate_job_options() + __generate_input_files(targets) -def run() -> None: - run_targets([ get_target(_) for _ in ARG("targets")]) + if not ARG("dry_run"): + __execute_job_script(qsystem) diff --git a/toolchain/mfc/test/case.py b/toolchain/mfc/test/case.py index aca9cebbd2..711024a2df 100644 --- a/toolchain/mfc/test/case.py +++ b/toolchain/mfc/test/case.py @@ -106,29 +106,25 @@ def __init__(self, trace: str, mods: dict, ppn: int = None, opt: bool = None) -> def run(self, targets: typing.List[typing.Union[str, MFCTarget]], gpus: typing.Set[int]) -> subprocess.CompletedProcess: if gpus is not None and len(gpus) != 0: - gpus_select = f"--gpus {' '.join([str(_) for _ in gpus])}" + gpus_select = ["--gpus"] + [str(_) for _ in gpus] else: - gpus_select = "" + gpus_select = [] - filepath = f'"{self.get_dirpath()}/case.py"' - tasks = f"-n {self.ppn}" - jobs = f"-j {ARG('jobs')}" if ARG("case_optimization") else "" - 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" + filepath = f'{self.get_dirpath()}/case.py' + tasks = ["-n", str(self.ppn)] + jobs = ["-j", str(ARG("jobs"))] if ARG("case_optimization") 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" target_names = [ get_target(t).name for t in targets ] - command: str = f'''\ - {mfc_script} run {filepath} {tasks} {binary_option} \ - {case_optimization} {jobs} -t {' '.join(target_names)} \ - {gpus_select} 2>&1\ - ''' + command = [ + mfc_script, "run", filepath, *tasks, *case_optimization, + *jobs, "-t", *target_names, *gpus_select, *ARG("--") + ] - return subprocess.run(command, stdout=subprocess.PIPE, - stderr=subprocess.PIPE, universal_newlines=True, - shell=True, check=False) + return common.system(command, print_cmd=False, text=True, capture_output=True) def get_uuid(self) -> str: return hex(binascii.crc32(hashlib.sha1(str(self.trace).encode()).digest())).upper()[2:].zfill(8) @@ -139,8 +135,11 @@ def get_dirpath(self): def delete_output(self): dirpath = self.get_dirpath() - exts = ["*.inp", "*.1", "*.dat", "*.inf"] + exts = ["*.inp", "*.1", "*.dat", "*.inf", "*.sh", "*.txt"] for f in list(itertools.chain.from_iterable(glob.glob(os.path.join(dirpath, ext)) for ext in exts)): + if "golden" in f: + continue + common.delete_file(f) common.delete_directory(os.path.join(dirpath, "D")) @@ -148,7 +147,7 @@ def delete_output(self): common.delete_directory(os.path.join(dirpath, "silo_hdf5")) common.delete_directory(os.path.join(dirpath, "restart_data")) - for f in ["pre_process", "simulation", "post_process"]: + for f in ["pack", "pre_process", "simulation", "post_process"]: common.delete_file(os.path.join(dirpath, f"{f}.txt")) def create_directory(self): @@ -198,12 +197,6 @@ def create_directory(self): mods['omega_wrt(3)'] = 'T' print(json.dumps({{**case, **mods}})) -""") - - common.file_write(f"{dirpath}/README.md", f"""\ -# tests/{self.get_uuid()} - -{self.trace}: [case.py](case.py). """) def __str__(self) -> str: diff --git a/toolchain/mfc/test/test.py b/toolchain/mfc/test/test.py index 73986da835..adca675dad 100644 --- a/toolchain/mfc/test/test.py +++ b/toolchain/mfc/test/test.py @@ -10,7 +10,7 @@ from .cases import generate_cases from .. import sched from ..common import MFCException, does_command_exist, format_list_to_string, get_program_output -from ..build import build_targets, HDF5, PRE_PROCESS, SIMULATION, POST_PROCESS +from ..build import build, HDF5, PRE_PROCESS, SIMULATION, POST_PROCESS from ..packer import tol as packtol from ..packer import packer @@ -94,7 +94,7 @@ def test(): codes = [PRE_PROCESS, SIMULATION] + ([POST_PROCESS] if ARG('test_all') else []) if not ARG("case_optimization"): - build_targets(codes) + build(codes) cons.print() diff --git a/toolchain/requirements.txt b/toolchain/requirements.txt index b3495c7d58..fd2377a6df 100644 --- a/toolchain/requirements.txt +++ b/toolchain/requirements.txt @@ -1,5 +1,6 @@ rich fypp +mako wheel typing PyYAML diff --git a/toolchain/templates/bridges2.mako b/toolchain/templates/bridges2.mako new file mode 100644 index 0000000000..34d7187160 --- /dev/null +++ b/toolchain/templates/bridges2.mako @@ -0,0 +1,61 @@ +#!/usr/bin/env bash + +% if engine == 'batch': +#SBATCH --nodes=${nodes} +#SBATCH --ntasks-per-node=${tasks_per_node} +#SBATCH --cpus-per-task=1 +#SBATCH --job-name="${name}" +#SBATCH --time=${walltime} +% if partition: +#SBATCH --partition=${partition} +% endif +% if account: +#SBATCH --account="${account}" +% endif +% if gpu: +#SBATCH --gpu-bind=verbose,closest +#SBATCH --gres=gpu:v100-16:${tasks_per_node} +% endif +#SBATCH --output="${name}.out" +#SBATCH --error="${name}.err" +#SBATCH --export=ALL +% if email: +#SBATCH --mail-user=${email} +#SBATCH --mail-type="BEGIN, END, FAIL" +% endif +% endif + +<%include file="prologue.mako"/> + +ok ":) Loading modules:\n" +cd "${rootdir}" +. ./mfc.sh load -c b -m ${'g' if gpu else 'c'} +cd - > /dev/null +echo + +% for binpath in binpaths: + ok -e ":) Running ${binpath.split('/')[-1]}:\n" + + % if not mpi: + ${' '.join([f"'{x}'" for x in profiler ])} "${binpath}" + % else: + ${' '.join([f"'{x}'" for x in profiler ])} \ + mpirun -np ${nodes*tasks_per_node} \ + ${' '.join([f"'{x}'" for x in ARG('--') ])} \ + "${binpath}" + % endif + + % if engine == 'interactive': + code=$? + if [ $code -ne 0 ]; then + echo + error ":( $MAGENTA${binpath}$COLOR_RESET failed with exit code $MAGENTA$code$COLOR_RESET." + echo + exit 1 + fi + % endif + + echo +% endfor + +<%include file="epilogue.mako"/> diff --git a/toolchain/templates/default.mako b/toolchain/templates/default.mako new file mode 100644 index 0000000000..9917e0517a --- /dev/null +++ b/toolchain/templates/default.mako @@ -0,0 +1,70 @@ +#!/usr/bin/env bash + +. "${rootdir}/toolchain/util.sh" + +% if engine == 'batch': + error "The$MAGENTA default$COLOR_RESET template does not support batch jobs. Please use a different template via the $MAGENTA--computer$COLOR_RESET option.\n" + exit 1 +% endif + +<%include file="prologue.mako"/> + +warn "This is the$MAGENTA default$COLOR_RESET template." +warn "It is not intended to support all systems and execution engines." +warn "Please use a different template via the $MAGENTA--computer$COLOR_RESET option." + +% if mpi: + # Find a suitable MPI launcher and store it in the variable "binary". + for binary in ${binary or ''} jsrun srun mpirun mpiexec; do + if command -v $binary > /dev/null; then + break + fi + done + + if ! command -v $binary > /dev/null; then + error ":( Could not find a suitable MPI launcher.\n" + exit 1 + else + ok ":) Selected MPI launcher $MAGENTA$binary$COLOR_RESET. Use$MAGENTA --binary$COLOR_RESET to override." + fi +% endif + +% for binpath in binpaths: + ok ":) Running $MAGENTA${binpath}$COLOR_RESET:\n" + + % if not mpi: + ${' '.join([f"'{x}'" for x in profiler ])} "${binpath}" + % else: + if [ "$binary" == "jsrun" ]; then + ${' '.join([f"'{x}'" for x in profiler ])} \ + jsrun --nrs ${tasks_per_node*nodes} \ + --cpu_per_rs 1 \ + --gpu_per_rs ${1 if gpu else 0} \ + --tasks_per_rs 1 \ + ${' '.join([f"'{x}'" for x in ARG('--') ])} \ + "${binpath}" + elif [ "$binary" == "srun" ]; then + ${' '.join([f"'{x}'" for x in profiler ])} \ + srun --ntasks-per-node ${tasks_per_node} \ + ${' '.join([f"'{x}'" for x in ARG('--') ])} \ + "${binpath}" + elif [ "$binary" == "mpirun" ] || [ "$binary" == "mpiexec" ]; then + ${' '.join([f"'{x}'" for x in profiler ])} \ + $binary -np ${nodes*tasks_per_node} \ + ${' '.join([f"'{x}'" for x in ARG('--') ])} \ + "${binpath}" + fi + % endif + + code=$? + if [ $code -ne 0 ]; then + echo + error ":( $MAGENTA${binpath}$COLOR_RESET failed with exit code $MAGENTA$code$COLOR_RESET." + echo + exit 1 + fi + + echo +% endfor + +<%include file="epilogue.mako"/> diff --git a/toolchain/templates/include/epilogue.mako b/toolchain/templates/include/epilogue.mako new file mode 100644 index 0000000000..183b6b8f54 --- /dev/null +++ b/toolchain/templates/include/epilogue.mako @@ -0,0 +1,16 @@ +#> +#> The MFC epilogue stops the timer and prints the execution summary. It also +#> performs some cleanup and housekeeping tasks before exiting. +#> + +code=$? + +t_stop="$(date +%s)" + +printf "$TABLE_HEADER" +printf "$TABLE_TITLE_FORMAT" "Finished" "$MAGENTA${name}$COLOR_RESET:" +printf "$TABLE_FORMAT_LINE" "Total-time:" "$(expr $t_stop - $t_start)s" "Exit Code:" "$code" +printf "$TABLE_FORMAT_LINE" "End-time:" "$(date +%T)" "End-date:" "$(date +%T)" +printf "$TABLE_FOOTER" + +exit $code \ No newline at end of file diff --git a/toolchain/templates/include/prologue.mako b/toolchain/templates/include/prologue.mako new file mode 100644 index 0000000000..aa99620428 --- /dev/null +++ b/toolchain/templates/include/prologue.mako @@ -0,0 +1,37 @@ +#> +#> The MFC prologue prints a summary of the running job and starts a timer. +#> + +<%! +import os +%>\ + +. "${rootdir}/toolchain/util.sh" + +TABLE_FORMAT_LINE="| * %-14s $MAGENTA%-35s$COLOR_RESET * %-14s $MAGENTA%-35s$COLOR_RESET |\\n" +TABLE_HEADER="+-----------------------------------------------------------------------------------------------------------+ \\n" +TABLE_FOOTER="+-----------------------------------------------------------------------------------------------------------+ \\n" +TABLE_TITLE_FORMAT="| %-105s |\\n" +TABLE_CONTENT=$(cat <<-END +$(printf "$TABLE_FORMAT_LINE" "Start-time" "$(date +%T)" "Start-date" "$(date +%T)") +$(printf "$TABLE_FORMAT_LINE" "Partition" "${partition or 'N/A'}" "Walltime" "${walltime}") +$(printf "$TABLE_FORMAT_LINE" "Account" "${account or 'N/A'}" "Nodes" "${nodes}") +$(printf "$TABLE_FORMAT_LINE" "Job Name" "${name}" "Engine" "${engine}") +$(printf "$TABLE_FORMAT_LINE" "QoS" "${quality_of_service or 'N/A'}" "Binary" "${binary or 'N/A'}") +$(printf "$TABLE_FORMAT_LINE" "Queue System" "${qsystem.name}" "Email" "${email or 'N/A'}") +END +) + +printf "$TABLE_HEADER" +printf "$TABLE_TITLE_FORMAT" "MFC case # ${name} @ ${input}:" +printf "$TABLE_HEADER" +printf "$TABLE_CONTENT\\n" +printf "$TABLE_FOOTER\\n" + +% for key, value in env.items(): + export ${key}='${value}' +% endfor + +cd "${os.path.dirname(input)}" + +t_start=$(date +%s) \ No newline at end of file diff --git a/toolchain/templates/lsf.sh b/toolchain/templates/lsf.sh deleted file mode 100644 index 1db260b0ba..0000000000 --- a/toolchain/templates/lsf.sh +++ /dev/null @@ -1,88 +0,0 @@ -#!/usr/bin/env bash -#> -#> - LSF Batch File Template - -#> -#> This file is part of the ./mfc.sh run subsystem. -#> For more information, please consult the README. -#> -#> - You are invited to modify this file to suit your -#> needs, in order to get MFC running properly on -#> your system. -#> -#> - Lines that begin with "#>" are ignored and won't -#> figure in the final batch script, not even as a -#> comment. -#> -#> - Statements of the form `${expression}` are string- -#> -replaced by mfc.sh run to provide runtime parameters, -#> most notably execution options. They reference the -#> variables in the same format as those under the "run" -#> section of [mfc.user.yaml](mfc.user.yaml), replacing -#> "-" for "_". You can perform therein any Python operation -#> recognized by the built-in `expr()` function. -#> -#> - Statements of the form {MFC::expression} tell MFC -#> where to place the common code, across all batch -#> files that is required to run MFC. They are not -#> intended to be modified by users. -#> -#BSUB -J {name} -#BSUB -nnodes {nodes} -#BSUB -N -#BSUB -P {account} -#BSUB -W {walltime[:-3]} -#> -#> Note: The above expression for the walltime converts -#> the expression "hh:mm:ss" to the appropriate -#> format for the batch system ("hh:mm"). It is -#> a python expression evaluated at runtime. -#> -#> -#> Note: The following options aren't enabled by default. -#> They serve as a guide to users that wish to pass -#> more options to the batch system. -#> - - - -#> -#> Note: If your system requires you to load environment -#> modules inside of your batch script, please load -#> them bellow. -#> - - - -#> -#> Note: The MFC prologue sets up the environment required -#> prior to execution. -#> -{MFC::PROLOGUE} - -#> -#> Note: This MPI executable might not be well supported -#> on your system - if at all. {MFC::BIN} refers to -#> the path the MFC executable. -#> - -for binpath in {MFC::BINARIES}; do - - echo -e ":) Running $binpath:" - echo "" - - jsrun \ - {'--smpiargs="-gpu"' if gpu else ''} \ - --nrs {tasks_per_node*nodes} \ - --cpu_per_rs 1 \ - --gpu_per_rs {1 if gpu else 0} \ - --tasks_per_rs 1 \ - {MFC::PROFILER} "$binpath" - - echo "" - -done - -{MFC::EPILOGUE} -#> -#> Note: Lines after the MFC Epilogue will not be executed. -#> diff --git a/toolchain/templates/pbs.sh b/toolchain/templates/pbs.sh deleted file mode 100644 index 839b9fe3cf..0000000000 --- a/toolchain/templates/pbs.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/usr/bin/env bash -#> -#> - PBS Batch File Template - -#> -#> This file is part of the ./mfc.sh run subsystem. -#> For more information, please consult the README. -#> -#> - You are invited to modify this file to suit your -#> needs, in order to get MFC running properly on -#> your system. -#> -#> - Lines that begin with "#>" are ignored and won't -#> figure in the final batch script, not even as a -#> comment. -#> -#> - Statements of the form `${expression}` are string- -#> -replaced by mfc.sh run to provide runtime parameters, -#> most notably execution options. They reference the -#> variables in the same format as those under the "run" -#> section of [mfc.user.yaml](mfc.user.yaml), replacing -#> "-" for "_". You can perform therein any Python operation -#> recognized by the built-in `expr()` function. -#> -#> - Statements of the form {MFC::expression} tell MFC -#> where to place the common code, across all batch -#> files that is required to run MFC. They are not -#> intended to be modified by users. -#> -#PBS -N {name} -#PBS -l nodes={nodes}:ppn={tasks_per_node} -#PBS -A {account} -#PBS -l walltime={walltime} -#PBS -q {partition} -#PBS -M {email} -#> -#> Note: The following options aren't enabled by default. -#> They serve as a guide to users that wish to pass -#> more options to the batch system. -#> - - - - -#> -#> Note: If your system requires you to load environment -#> modules inside of your batch script, please load -#> them bellow. -#> - - - -#> -#> Note: The MFC prologue sets up the environment required -#> prior to execution. -#> -{MFC::PROLOGUE} - -#> -#> Note: This MPI executable might not be well supported -#> on your system - if at all. {MFC::BIN} refers to -#> the path the MFC executable. -#> - -for binpath in {MFC::BINARIES}; do - - echo -e ":) Running $binpath:" - - if command -v srun > /dev/null 2>&1; then - srun \ - --nodes {nodes} \ - --ntasks-per-node {tasks_per_node} \ - {MFC::PROFILER} "$binpath" - - #> - #> srun --mpi=pmix \ - #> {MFC::PROFILER} "$binpath" - else - mpirun \ - -np {tasks_per_node*nodes} \ - {MFC::PROFILER} "$binpath" - - fi - -done - -{MFC::EPILOGUE} -#> -#> Note: Lines after the MFC Epilogue will not be executed. -#> - diff --git a/toolchain/templates/phoenix.mako b/toolchain/templates/phoenix.mako new file mode 100644 index 0000000000..80c70f97ea --- /dev/null +++ b/toolchain/templates/phoenix.mako @@ -0,0 +1,62 @@ +#!/usr/bin/env bash + +% if engine == 'batch': +#SBATCH --nodes=${nodes} +#SBATCH --ntasks-per-node=${tasks_per_node} +#SBATCH --job-name="${name}" +#SBATCH --output="${name}.out" +#SBATCH --time=${walltime} +% if account: +#SBATCH --account=${account} +% endif +% if partition: +#SBATCH --partition=${partition} +% endif +% if quality_of_service: +#SBATCH --qos=${quality_of_service} +% endif +% if gpu: +#SBATCH --gres=gpu:V100:${tasks_per_node} +#SBATCH --mem-per-gpu=16G\ +% endif +% if email: +#SBATCH --mail-user=${email} +#SBATCH --mail-type="BEGIN, END, FAIL" +% endif +% endif + +<%include file="prologue.mako"/> + +ok ":) Loading modules:\n" +cd "${rootdir}" +. ./mfc.sh load -c p -m ${'g' if gpu else 'c'} +cd - > /dev/null +echo + +% for binpath in binpaths: + ok ":) Running ${binpath.split('/')[-1]}:\n" + + % if not mpi: + ${' '.join([f"'{x}'" for x in profiler ])} "${binpath}" + % else: + ${' '.join([f"'{x}'" for x in profiler ])} \ + mpirun -np ${nodes*tasks_per_node} \ + --bind-to none \ + ${' '.join([f"'{x}'" for x in ARG('--') ])} \ + "${binpath}" + % endif + + % if engine == 'interactive': + code=$? + if [ $code -ne 0 ]; then + echo + error ":( $MAGENTA${binpath}$COLOR_RESET failed with exit code $MAGENTA$code$COLOR_RESET." + echo + exit 1 + fi + % endif + + echo +% endfor + +<%include file="epilogue.mako"/> diff --git a/toolchain/templates/slurm.sh b/toolchain/templates/slurm.sh deleted file mode 100644 index 11982cb408..0000000000 --- a/toolchain/templates/slurm.sh +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/env bash -#> -#> - SLURM Batch File Template - -#> -#> This file is part of the ./mfc.sh run subsystem. -#> For more information, please consult the README. -#> -#> - You are invited to modify this file to suit your -#> needs, in order to get MFC running properly on -#> your system. -#> -#> - Lines that begin with "#>" are ignored and won't -#> figure in the final batch script, not even as a -#> comment. -#> -#> - Statements of the form `${expression}` are string- -#> -replaced by mfc.sh run to provide runtime parameters, -#> most notably execution options. They reference the -#> variables in the same format as those under the "run" -#> section of [mfc.user.yaml](mfc.user.yaml), replacing -#> "-" for "_". You can perform therein any Python operation -#> recognized by the built-in `expr()` function. -#> -#> - Statements of the form {MFC::expression} tell MFC -#> where to place the common code, across all batch -#> files that is required to run MFC. They are not -#> intended to be modified by users. -#> -#SBATCH --job-name="{name}" -#SBATCH --nodes={nodes} -#SBATCH --ntasks-per-node={tasks_per_node} -#SBATCH --cpus-per-task=1 -#SBATCH --gpu-bind=verbose,closest -#SBATCH --gpus=v100-16:{(1 if gpu else 0)*tasks_per_node*nodes} -#SBATCH --time={walltime} -#SBATCH --partition="{partition}" -#SBATCH --output="{name}.out" -#SBATCH --account="{account}" -#SBATCH --error="{name}.err" -#SBATCH --mail-user="{email}" -#SBATCH --export=ALL -#SBATCH --mail-type="BEGIN, END, FAIL" -#> -#> Note: The following options aren't enabled by default. -#> They serve as a guide to users that wish to pass -#> more options to the batch system. -#> -#> #SBATCH --mem=... -#> #SBATCH --constraint="lustre" -#> #SBATCH --gpus-per-task={1 if gpu else 0} - - -#> -#> Note: If your system requires you to load environment -#> modules inside of your batch script, please load -#> them bellow. -#> - - -#> -#> Note: The MFC prologue sets up the environment required -#> prior to execution. -#> -{MFC::PROLOGUE} - - -#> -#> Note: This MPI executable might not be well supported -#> on your system - if at all. {MFC::BIN} refers to -#> the path the MFC executable. -#> - -for binpath in {MFC::BINARIES}; do - - echo -e ":) Running $binpath:" - - if command -v srun > /dev/null 2>&1; then - srun \ - --nodes {nodes} \ - --ntasks-per-node {tasks_per_node} \ - {MFC::PROFILER} "$binpath" - - #> - #> srun --mpi=pmix \ - #> {MFC::PROFILER} "$binpath" - #> - else - mpirun \ - -np {nodes*tasks_per_node} \ - {MFC::PROFILER} "$binpath" - fi - -done - -{MFC::EPILOGUE} - -#> -#> Note: Lines after the MFC Epilogue will not be executed. -#> diff --git a/toolchain/templates/summit.mako b/toolchain/templates/summit.mako new file mode 100644 index 0000000000..a9a888c41b --- /dev/null +++ b/toolchain/templates/summit.mako @@ -0,0 +1,51 @@ +#!/usr/bin/env bash + +% if engine == 'batch': +#BSUB -J {{{name}}} +#BSUB -nnodes {{{nodes}}} +#BSUB -W {{{walltime[:-3]}}} +#BSUB -N +% if account: +#BSUB -P {{{account}}} +% endif +% endif + +<%include file="prologue.mako"/> + +ok ":) Loading modules:\n" +cd "${rootdir}" +. ./mfc.sh load -c s -m ${'g' if gpu else 'c'} +cd - > /dev/null +echo + +% for binpath in binpaths: + ok ":) Running ${binpath}:\n" + + % if not mpi: + ${' '.join([f"'{x}'" for x in profiler ])} "${binpath}" + % else: + ${' '.join([f"'{x}'" for x in profiler ])} \ + jsrun \ + ${'--smpiargs="-gpu"' if gpu else ''} \ + --nrs ${tasks_per_node*nodes} \ + --cpu_per_rs 1 \ + --gpu_per_rs ${1 if gpu else 0} \ + --tasks_per_rs 1 \ + ${' '.join([f"'{x}'" for x in ARG('--') ])} \ + "${binpath}" + % endif + + % if engine == 'interactive': + code=$? + if [ $code -ne 0 ]; then + echo + error ":( $MAGENTA${binpath}$COLOR_RESET failed with exit code $MAGENTA$code$COLOR_RESET." + echo + exit 1 + fi + % endif + + echo +% endfor + +<%include file="epilogue.mako"/>