diff --git a/README.md b/README.md index bda424f..a78e802 100644 --- a/README.md +++ b/README.md @@ -31,22 +31,22 @@ To obtain a list of program and simulation parameters, use julia --help -### refl-ex1.jl +### ex1-refl.jl This example is a 1 DOF system with a reflection semi-symmetry (when _f_ small enough). It is a double well potential given by _U = a x4 - b x2 - f x_. -### trans-ex2.jl +### ex2-trans.jl This example is a 1 DOF system with discrete translational semi-symmetry (_f_ small enough). It is a periodic potential consisting of many wells given by _U = a_ cos(_n x_) _- f x_. -### D2-ex3.jl +### ex3-D2.jl This example is a 2 DOF system with D2 semi-symmetry. -### rosenbrock-ex4.jl +### ex4-rosenbrock.jl This example is a toy 2 DOF system which has a notoriously difficult energy landscape. It has a semi-symmetry x → -x, which is strictly symmetric when a → 0. -### harddisks-refl-ex5.jl +### ex5-harddisks-refl.jl This is the first example involving interacting particles. Here we have multiple particles in the same energy landscape with reflection symmetry as seen in refl-ex1.jl. The particles each have a single degree of freedom and are hard disks (interact via an excluded volume potential). @@ -55,7 +55,7 @@ This example shows the ways in which this method can be generalized to more comp It is also the first example which resides in a high dimensional space (scales linearly with the number of disks), which motivates the necessity for stochastic integration. That is, all of the previous examples can be readily solved using quadrature, but quadrature would struggle for this system when there is a large number of particles. -### D2h-ex6.jl +### ex6-D2h.jl This example represents another push toward more realistic physical systems. Here we imagine an ion in a crystalline lattice. It interacts with atoms in the lattice (which are idealized as fixed) via an electrostatic Coloumb potential. diff --git a/refl-ex1.jl b/ex1-refl.jl similarity index 100% rename from refl-ex1.jl rename to ex1-refl.jl diff --git a/trans-ex2.jl b/ex2-trans.jl similarity index 100% rename from trans-ex2.jl rename to ex2-trans.jl diff --git a/D2-ex3.jl b/ex3-D2.jl similarity index 100% rename from D2-ex3.jl rename to ex3-D2.jl diff --git a/rosenbrock-ex4.jl b/ex4-rosenbrock.jl similarity index 100% rename from rosenbrock-ex4.jl rename to ex4-rosenbrock.jl diff --git a/harddisks-refl-ex5.jl b/ex5-harddisks-refl.jl similarity index 100% rename from harddisks-refl-ex5.jl rename to ex5-harddisks-refl.jl diff --git a/D2h-ex6.jl b/ex6-D2h.jl similarity index 100% rename from D2h-ex6.jl rename to ex6-D2h.jl diff --git a/D2h-LJ-ex7.jl b/ex7-D2h-LJ.jl similarity index 100% rename from D2h-LJ-ex7.jl rename to ex7-D2h-LJ.jl diff --git a/param_study/00_initial-study_2021-05-10.jl b/param_study/00_initial-study_2021-05-10.jl index 1843972..779e8de 100644 --- a/param_study/00_initial-study_2021-05-10.jl +++ b/param_study/00_initial-study_2021-05-10.jl @@ -55,7 +55,7 @@ names = [ cases = reshape(cases, length(cases)); println("total number of cases to run for ex1: $(length(cases))"); -exoutdir = joinpath(workdir, "refl-ex1"); +exoutdir = joinpath(workdir, "ex1-refl"); mkpath(exoutdir); pmap(pair -> begin; name, case = pair; @@ -63,7 +63,7 @@ pmap(pair -> begin; mkpath(local_outdir); outfile = joinpath(local_outdir, "out.txt"); if !dryrun && !isfile(outfile) - command = `julia -O 3 -p $nsubprocs "refl-ex1.jl" -a $(case[:a]) -b $(case[:b]) --x0 $(case[:x0]) -f $(case[:f]) --verbose 2 --outdir $(local_outdir) --do-csvs` + command = `julia -O 3 -p $nsubprocs "ex1-refl.jl" -a $(case[:a]) -b $(case[:b]) --x0 $(case[:x0]) -f $(case[:f]) --verbose 2 --outdir $(local_outdir) --do-csvs` output = read(command, String); write(outfile, output); else @@ -107,7 +107,7 @@ names = [ cases = reshape(cases, length(cases)); println("total number of cases to run for ex2: $(length(cases))"); -exoutdir = joinpath(workdir, "trans-ex2"); +exoutdir = joinpath(workdir, "ex2-trans"); mkpath(exoutdir); pmap(pair -> begin; name, case = pair; @@ -115,7 +115,7 @@ pmap(pair -> begin; mkpath(local_outdir); outfile = joinpath(local_outdir, "out.txt"); if !dryrun && !isfile(outfile) - command = `julia -O 3 -p $nsubprocs "trans-ex2.jl" -a $(case[:a]) -n $(case[:n]) --x0 $(case[:x0]) -f $(case[:f]) --outdir $(local_outdir) --do-csvs --verbose 2` + command = `julia -O 3 -p $nsubprocs "ex2-trans.jl" -a $(case[:a]) -n $(case[:n]) --x0 $(case[:x0]) -f $(case[:f]) --outdir $(local_outdir) --do-csvs --verbose 2` output = read(command, String); write(outfile, output); else @@ -164,7 +164,7 @@ names = [ cases = reshape(cases, length(cases)); println("total number of cases to run for ex3: $(length(cases))"); -exoutdir = joinpath(workdir, "D2-ex3"); +exoutdir = joinpath(workdir, "ex3-D2"); mkpath(exoutdir); pmap(pair -> begin; name, case = pair; @@ -172,7 +172,7 @@ pmap(pair -> begin; mkpath(local_outdir); outfile = joinpath(local_outdir, "out.txt"); if !dryrun && !isfile(outfile) - command = `julia -O 3 -p $nsubprocs "D2-ex3.jl" -k $(case[:k]) -l $(case[:l]) --x0 $(case[:x0]) -f "[$(case[:f]); $(case[:g])]" --verbose 2 --outdir $(local_outdir) --do-csvs` + command = `julia -O 3 -p $nsubprocs "ex3-D2.jl" -k $(case[:k]) -l $(case[:l]) --x0 $(case[:x0]) -f "[$(case[:f]); $(case[:g])]" --verbose 2 --outdir $(local_outdir) --do-csvs` output = read(command, String); write(outfile, output); else @@ -215,7 +215,7 @@ names = [ cases = reshape(cases, length(cases)); println("total number of cases to run for ex4: $(length(cases))"); -exoutdir = joinpath(workdir, "rosenbrock-ex4"); +exoutdir = joinpath(workdir, "ex4-rosenbrock"); mkpath(exoutdir); pmap(pair -> begin; name, case = pair; @@ -223,7 +223,7 @@ pmap(pair -> begin; mkpath(local_outdir); outfile = joinpath(local_outdir, "out.txt"); if !dryrun && !isfile(outfile) - command = `julia -O 3 -p $nsubprocs "rosenbrock-ex4.jl" -a $(case[:a]) -b $(case[:b]) --x0 $(case[:x0]) -f "[$(case[:f]); $(case[:g])]" --verbose 2 --outdir $(local_outdir) --do-csvs` + command = `julia -O 3 -p $nsubprocs "ex4-rosenbrock.jl" -a $(case[:a]) -b $(case[:b]) --x0 $(case[:x0]) -f "[$(case[:f]); $(case[:g])]" --verbose 2 --outdir $(local_outdir) --do-csvs` output = read(command, String); write(outfile, output); else diff --git a/param_study/01_harddisks_2021-08-23.jl b/param_study/01_harddisks_2021-08-23.jl index 9351c9e..575e641 100644 --- a/param_study/01_harddisks_2021-08-23.jl +++ b/param_study/01_harddisks_2021-08-23.jl @@ -46,7 +46,7 @@ names = [ cases = reshape(cases, length(cases)); println("total number of cases to run for ex5: $(length(cases))"); -exoutdir = joinpath(workdir, "harddisks-refl-ex5"); +exoutdir = joinpath(workdir, "ex5-harddisks-refl"); mkpath(exoutdir); map(pair -> begin; name, case = pair; @@ -54,7 +54,7 @@ map(pair -> begin; mkpath(local_outdir); outfile = joinpath(local_outdir, "out.txt"); if !dryrun && !isfile(outfile) - command = `julia -O 3 -p $nsubprocs harddisks-refl-ex5.jl -a $(case[:a]) -b $(case[:b]) --num-disks $(case[:nd]) --disk-diameter $(case[:dd]) -f $(case[:f]) --verbose 2 --outdir $(local_outdir) --do-csvs` + command = `julia -O 3 -p $nsubprocs ex5-harddisks-refl.jl -a $(case[:a]) -b $(case[:b]) --num-disks $(case[:nd]) --disk-diameter $(case[:dd]) -f $(case[:f]) --verbose 2 --outdir $(local_outdir) --do-csvs` output = read(command, String); write(outfile, output); else diff --git a/param_study/02_D2h_2021-08-24.jl b/param_study/02_D2h_2021-08-24.jl index 7056386..7be57d1 100644 --- a/param_study/02_D2h_2021-08-24.jl +++ b/param_study/02_D2h_2021-08-24.jl @@ -46,7 +46,7 @@ names = [ cases = reshape(cases, length(cases)); println("total number of cases to run for ex6: $(length(cases))"); -exoutdir = joinpath(workdir, "D2h-ex6"); +exoutdir = joinpath(workdir, "ex6-D2h"); mkpath(exoutdir); map(pair -> begin; name, case = pair; @@ -54,7 +54,7 @@ map(pair -> begin; mkpath(local_outdir); outfile = joinpath(local_outdir, "out.txt"); if !dryrun && !isfile(outfile) - command = `julia -O 3 -p $nsubprocs D2h-ex6.jl -a $(case[:a]) -b $(case[:b]) -c $(case[:c]) --charge $(case[:q]) -f "[$(case[:f]); 0.0; 0.0]" --verbose 2 --outdir $(local_outdir) --do-csvs` + command = `julia -O 3 -p $nsubprocs ex6-D2h.jl -a $(case[:a]) -b $(case[:b]) -c $(case[:c]) --charge $(case[:q]) -f "[$(case[:f]); 0.0; 0.0]" --verbose 2 --outdir $(local_outdir) --do-csvs` output = read(command, String); write(outfile, output); else diff --git a/param_study/03_refl-ex1_force-displ_2021-09-20.jl b/param_study/03_refl-ex1_force-displ_2021-09-20.jl index 6cc1e7c..13ef564 100644 --- a/param_study/03_refl-ex1_force-displ_2021-09-20.jl +++ b/param_study/03_refl-ex1_force-displ_2021-09-20.jl @@ -27,7 +27,7 @@ for f in vcat(collect(0.001:0.001:0.005), collect(0.01:0.01:0.05), mkpath(local_outdir); outfile = joinpath(local_outdir, "out.txt"); if !dryrun && !isfile(outfile) - command = `julia -O 3 -p $nsubprocs "refl-ex1.jl" -a 1.0 -b 8.0 --x0 "(::Any) -> 0.0" -f $f --umbrella-b 2.0 --dx 1.0 -R 100 -N 1000000 --stepout 500 --kT 1.0 --verbose 3 --outdir $(local_outdir) --do-csvs` + command = `julia -O 3 -p $nsubprocs "ex1-refl.jl" -a 1.0 -b 8.0 --x0 "(::Any) -> 0.0" -f $f --umbrella-b 2.0 --dx 1.0 -R 100 -N 1000000 --stepout 500 --kT 1.0 --verbose 3 --outdir $(local_outdir) --do-csvs` output = read(command, String); write(outfile, output); else diff --git a/param_study/04_table_2021-09-23.jl b/param_study/04_table_2021-09-23.jl index 4616d5a..2afe67b 100644 --- a/param_study/04_table_2021-09-23.jl +++ b/param_study/04_table_2021-09-23.jl @@ -43,7 +43,7 @@ names = [ cases = reshape(cases, length(cases)); println("total number of cases to run for ex1: $(length(cases))"); -exoutdir = joinpath(workdir, "refl-ex1"); +exoutdir = joinpath(workdir, "ex1-refl"); mkpath(exoutdir); pmap(pair -> begin; name, case = pair; @@ -51,7 +51,7 @@ pmap(pair -> begin; mkpath(local_outdir); outfile = joinpath(local_outdir, "out.txt"); if !dryrun && !isfile(outfile) - command = `julia -O 3 -p $nsubprocs "refl-ex1.jl" -R $nruns -N $nsteps -a $(case[:a]) -b $(case[:b]) --kT $(case[:kT]) -f $(case[:f]) --verbose 2 --outdir $(local_outdir) --do-csvs` + command = `julia -O 3 -p $nsubprocs "ex1-refl.jl" -R $nruns -N $nsteps -a $(case[:a]) -b $(case[:b]) --kT $(case[:kT]) -f $(case[:f]) --verbose 2 --outdir $(local_outdir) --do-csvs` output = read(command, String); write(outfile, output); else @@ -82,7 +82,7 @@ names = [ ]; println("total number of cases to run for ex2: $(length(cases))"); -exoutdir = joinpath(workdir, "trans-ex2"); +exoutdir = joinpath(workdir, "ex2-trans"); mkpath(exoutdir); pmap(pair -> begin; name, case = pair; @@ -90,7 +90,7 @@ pmap(pair -> begin; mkpath(local_outdir); outfile = joinpath(local_outdir, "out.txt"); if !dryrun && !isfile(outfile) - command = `julia -O 3 -p $nsubprocs "trans-ex2.jl" -R $nruns -N $nsteps -a $(case[:a]) -n $(case[:n]) --kT $(case[:kT]) -f $(case[:f]) --outdir $(local_outdir) --do-csvs --verbose 2` + command = `julia -O 3 -p $nsubprocs "ex2-trans.jl" -R $nruns -N $nsteps -a $(case[:a]) -n $(case[:n]) --kT $(case[:kT]) -f $(case[:f]) --outdir $(local_outdir) --do-csvs --verbose 2` output = read(command, String); write(outfile, output); else @@ -129,7 +129,7 @@ names = [ cases = reshape(cases, length(cases)); println("total number of cases to run for ex6: $(length(cases))"); -exoutdir = joinpath(workdir, "D2h-ex6"); +exoutdir = joinpath(workdir, "ex6-D2h"); mkpath(exoutdir); map(pair -> begin; name, case = pair; @@ -137,7 +137,7 @@ map(pair -> begin; mkpath(local_outdir); outfile = joinpath(local_outdir, "out.txt"); if !dryrun && !isfile(outfile) - command = `julia -O 3 -p $nsubprocs D2h-ex6.jl --x0 "(args) -> rand(Uniform(-1, 1), 3)" -R $nruns -N $nsteps -a $(case[:a]) -b $(case[:b]) -c $(case[:c]) --charge $(case[:q]) -f "[$(case[:f]); 0.0; 0.0]" --verbose 2 --outdir $(local_outdir) --do-csvs` + command = `julia -O 3 -p $nsubprocs ex6-D2h.jl --x0 "(args) -> rand(Uniform(-1, 1), 3)" -R $nruns -N $nsteps -a $(case[:a]) -b $(case[:b]) -c $(case[:c]) --charge $(case[:q]) -f "[$(case[:f]); 0.0; 0.0]" --verbose 2 --outdir $(local_outdir) --do-csvs` output = read(command, String); write(outfile, output); else @@ -187,7 +187,7 @@ map(pair -> begin; mkpath(local_outdir); outfile = joinpath(local_outdir, "out.txt"); if !dryrun && !isfile(outfile) - command = `julia -O 3 -p $nsubprocs D2h-LJ-ex7.jl -R $nruns -N $nsteps -a $(case[:a]) -b $(case[:b]) -c $(case[:c]) --eps $(case[:eps]) --sigma $(case[:sigma]) -f "[$(case[:f]); 0.0; 0.0]" --verbose 2 --outdir $(local_outdir) --do-csvs` + command = `julia -O 3 -p $nsubprocs ex7-D2h-LJ.jl -R $nruns -N $nsteps -a $(case[:a]) -b $(case[:b]) -c $(case[:c]) --eps $(case[:eps]) --sigma $(case[:sigma]) -f "[$(case[:f]); 0.0; 0.0]" --verbose 2 --outdir $(local_outdir) --do-csvs` output = read(command, String); write(outfile, output); else diff --git a/param_study/05_table_2021-10-03.jl b/param_study/05_table_2021-10-03.jl index ceee57e..e3bdbce 100644 --- a/param_study/05_table_2021-10-03.jl +++ b/param_study/05_table_2021-10-03.jl @@ -49,7 +49,7 @@ names = [ cases = reshape(cases, length(cases)); println("total number of cases to run for ex6: $(length(cases))"); -exoutdir = joinpath(workdir, "D2h-ex6"); +exoutdir = joinpath(workdir, "ex6-D2h"); mkpath(exoutdir); pmap(pair -> begin; name, case = pair; @@ -58,7 +58,7 @@ pmap(pair -> begin; outfile = joinpath(local_outdir, "out.txt"); if !dryrun && !isfile(outfile) @info "Running case: $case."; - command = `julia -O 3 -p $nsubprocs D2h-ex6.jl --x0 "(args) -> rand(Uniform(-1, 1), 3)" -R $nruns -N $nsteps -a $(case[:a]) -b $(case[:b]) -c $(case[:c]) --charge $(case[:q]) -f "[$(case[:f]); 0.0; 0.0]" --verbose 2 --outdir $(local_outdir) --do-csvs` + command = `julia -O 3 -p $nsubprocs ex6-D2h.jl --x0 "(args) -> rand(Uniform(-1, 1), 3)" -R $nruns -N $nsteps -a $(case[:a]) -b $(case[:b]) -c $(case[:c]) --charge $(case[:q]) -f "[$(case[:f]); 0.0; 0.0]" --verbose 2 --outdir $(local_outdir) --do-csvs` output = read(command, String); write(outfile, output); else @@ -111,7 +111,7 @@ pmap(pair -> begin; outfile = joinpath(local_outdir, "out.txt"); if !dryrun && !isfile(outfile) @info "Running case: $case."; - command = `julia -O 3 -p $nsubprocs D2h-LJ-ex7.jl --x0 "(args) -> rand(Uniform(-1, 1), 3)" -R $nruns -N $nsteps -a $(case[:a]) -b $(case[:b]) -c $(case[:c]) --eps $(case[:eps]) --sigma $(case[:sigma]) -f "[$(case[:f]); 0.0; 0.0]" --verbose 2 --outdir $(local_outdir) --do-csvs` + command = `julia -O 3 -p $nsubprocs ex7-D2h-LJ.jl --x0 "(args) -> rand(Uniform(-1, 1), 3)" -R $nruns -N $nsteps -a $(case[:a]) -b $(case[:b]) -c $(case[:c]) --eps $(case[:eps]) --sigma $(case[:sigma]) -f "[$(case[:f]); 0.0; 0.0]" --verbose 2 --outdir $(local_outdir) --do-csvs` output = read(command, String); write(outfile, output); else diff --git a/param_study/06_table_2021-10-09.jl b/param_study/06_table_2021-10-09.jl index 6a3e493..40a3aee 100644 --- a/param_study/06_table_2021-10-09.jl +++ b/param_study/06_table_2021-10-09.jl @@ -49,7 +49,7 @@ names = [ cases = reshape(cases, length(cases)); println("total number of cases to run for ex6: $(length(cases))"); -exoutdir = joinpath(workdir, "D2h-ex6"); +exoutdir = joinpath(workdir, "ex6-D2h"); mkpath(exoutdir); pmap(pair -> begin; name, case = pair; @@ -58,7 +58,7 @@ pmap(pair -> begin; outfile = joinpath(local_outdir, "out.txt"); if !dryrun && !isfile(outfile) @info "Running case: $case."; - command = `julia -O 3 -p $nsubprocs D2h-ex6.jl -R $nruns -N $nsteps -a $(case[:a]) -b $(case[:b]) -c $(case[:c]) --charge $(case[:q]) -f "[$(case[:f]); 0.0; 0.0]" --verbose 2 --outdir $(local_outdir) --do-csvs` + command = `julia -O 3 -p $nsubprocs ex6-D2h.jl -R $nruns -N $nsteps -a $(case[:a]) -b $(case[:b]) -c $(case[:c]) --charge $(case[:q]) -f "[$(case[:f]); 0.0; 0.0]" --verbose 2 --outdir $(local_outdir) --do-csvs` output = read(command, String); write(outfile, output); else diff --git a/param_study/07_convergence-heat-map_2021-10-29.jl b/param_study/07_convergence-heat-map_2021-10-29.jl index 2cd86a9..05865c5 100644 --- a/param_study/07_convergence-heat-map_2021-10-29.jl +++ b/param_study/07_convergence-heat-map_2021-10-29.jl @@ -37,7 +37,7 @@ println("total number of cases to run for ex1: $(length(cases))"); mkpath(workdir); open(joinpath(workdir, "refl-conv.csv"), "w") do w rows = pmap(case -> begin; - command = `julia -O 3 -p $nsubprocs "refl-ex1.jl" -R $nruns -N $nsteps -a 1.0 -b $(case[:b]) --kT 1.0 -f $(case[:f]) --verbose 2 --do-conv-rates` + command = `julia -O 3 -p $nsubprocs "ex1-refl.jl" -R $nruns -N $nsteps -a 1.0 -b $(case[:b]) --kT 1.0 -f $(case[:f]) --verbose 2 --do-conv-rates` output = read(command, String); max_αs = Dict(); for line in split(output, '\n') @@ -72,7 +72,7 @@ cases = reshape(cases, length(cases)); println("total number of cases to run for ex2: $(length(cases))"); open(joinpath(workdir, "trans-conv.csv"), "w") do w rows = pmap(case -> begin; - command = `julia -O 3 -p $nsubprocs "trans-ex2.jl" -R $nruns -N $nsteps -a 1.0 -n $(case[:n]) --kT 1.0 -f $(case[:f]) --verbose 2 --do-conv-rates` + command = `julia -O 3 -p $nsubprocs "ex2-trans.jl" -R $nruns -N $nsteps -a 1.0 -n $(case[:n]) --kT 1.0 -f $(case[:f]) --verbose 2 --do-conv-rates` output = read(command, String); max_αs = Dict(); for line in split(output, '\n') diff --git a/param_study/08_conv-D2h_2021-11-01.jl b/param_study/08_conv-D2h_2021-11-01.jl index cd563b3..c139fd9 100644 --- a/param_study/08_conv-D2h_2021-11-01.jl +++ b/param_study/08_conv-D2h_2021-11-01.jl @@ -37,7 +37,7 @@ println("total number of cases to run for ex1: $(length(cases))"); mkpath(workdir); open(joinpath(workdir, "D2h-conv.csv"), "w") do w rows = pmap(case -> begin; - command = `julia -O 3 -p $nsubprocs "D2h-ex6.jl" -R $nruns -N $nsteps -a 1.0 -b 1.0 -c 1.0 --kT 1.0 -f "[$(case[:f]),0.0,0.0]" -q $(case[:q]) --verbose 2 --do-conv-rates` + command = `julia -O 3 -p $nsubprocs "ex6-D2h.jl" -R $nruns -N $nsteps -a 1.0 -b 1.0 -c 1.0 --kT 1.0 -f "[$(case[:f]),0.0,0.0]" -q $(case[:q]) --verbose 2 --do-conv-rates` output = read(command, String); max_αs = Dict(); for line in split(output, '\n') diff --git a/param_study/09_convergence-heat-map_2021-11-04.jl b/param_study/09_convergence-heat-map_2021-11-04.jl index d270d82..d2692da 100644 --- a/param_study/09_convergence-heat-map_2021-11-04.jl +++ b/param_study/09_convergence-heat-map_2021-11-04.jl @@ -36,7 +36,7 @@ println("total number of cases to run for ex2: $(length(cases))"); ks = ["std", "umb", "polya", "gu"]; open(joinpath(workdir, "trans-conv.csv"), "w") do w rows = pmap(case -> begin; - command = `julia -O 3 -p $nsubprocs "trans-ex2.jl" -R $nruns -N $nsteps -a $(case[:a]) -n 4 --kT 1.0 -f $(case[:f]) --verbose 2 --do-conv-rates` + command = `julia -O 3 -p $nsubprocs "ex2-trans.jl" -R $nruns -N $nsteps -a $(case[:a]) -n 4 --kT 1.0 -f $(case[:f]) --verbose 2 --do-conv-rates` output = read(command, String); max_αs = Dict(); for line in split(output, '\n') diff --git a/param_study/10_conv-D2h_2021-11-11.jl b/param_study/10_conv-D2h_2021-11-11.jl index 0922f93..5c50fb9 100644 --- a/param_study/10_conv-D2h_2021-11-11.jl +++ b/param_study/10_conv-D2h_2021-11-11.jl @@ -37,7 +37,7 @@ println("total number of cases to run for ex1: $(length(cases))"); mkpath(workdir); open(joinpath(workdir, "D2h-conv.csv"), "w") do w rows = pmap(case -> begin; - command = `julia -O 3 -p $nsubprocs "D2h-ex6.jl" -R $nruns -N $nsteps -a 1.0 -b 1.0 -c 1.0 --kT 1.0 -f "[$(case[:f]),$(case[:f]),$(case[:f])] / sqrt(3)" -q $(case[:q]) --verbose 2 --do-conv-rates` + command = `julia -O 3 -p $nsubprocs "ex6-D2h.jl" -R $nruns -N $nsteps -a 1.0 -b 1.0 -c 1.0 --kT 1.0 -f "[$(case[:f]),$(case[:f]),$(case[:f])] / sqrt(3)" -q $(case[:q]) --verbose 2 --do-conv-rates` output = read(command, String); max_αs = Dict(); for line in split(output, '\n') diff --git a/param_study/11_err-D2h_2021-11-14.jl b/param_study/11_err-D2h_2021-11-14.jl index 461579d..8631204 100644 --- a/param_study/11_err-D2h_2021-11-14.jl +++ b/param_study/11_err-D2h_2021-11-14.jl @@ -45,7 +45,7 @@ open(joinpath(workdir, "D2h-err.csv"), "w") do w mkpath(joinpath(workdir, subdir)); if !isfile(joinpath(workdir, subdir, "L1_Urolling.csv")) println("Running $case"); - command = `julia -O 3 -p $nsubprocs "D2h-ex6.jl" -R $nruns -N $nsteps -a 1.0 -b 1.0 -c 1.0 --kT 1.0 -f "[$(case[:f]),$(case[:f]),$(case[:f])] / sqrt(3)" -q $(case[:q]) --verbose 2 --do-conv-rates --do-csvs --outdir $(joinpath(workdir, subdir))` + command = `julia -O 3 -p $nsubprocs "ex6-D2h.jl" -R $nruns -N $nsteps -a 1.0 -b 1.0 -c 1.0 --kT 1.0 -f "[$(case[:f]),$(case[:f]),$(case[:f])] / sqrt(3)" -q $(case[:q]) --verbose 2 --do-conv-rates --do-csvs --outdir $(joinpath(workdir, subdir))` output = read(command, String); else println("$case already run");