Skip to content

Commit

Permalink
Merge pull request #26 from GeoscienceAustralia/single-file-writes
Browse files Browse the repository at this point in the history
Share output files between chains
  • Loading branch information
a2ray authored Jun 28, 2022
2 parents 7980ce0 + 16804d6 commit d2ffa8b
Show file tree
Hide file tree
Showing 36 changed files with 905 additions and 439 deletions.
3 changes: 1 addition & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
julia = "1.5.3"
DataInterpolations = "3.6.1"
Distances = "0.10.7"
DistributedArrays = "0.6.6"
Expand All @@ -50,4 +49,4 @@ PyPlot = "2.10.0"
Roots = "2.0.0"
SpecialFunctions = "1.6 - 2.1.4"
StatsBase = "0.33.16"

julia = "1.5.3"
2 changes: 1 addition & 1 deletion examples/1D/stat/02_run_lineregression_highλ.jl
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ opt = transD_GP.OptionsStat(nmin = nmin,
peskycholesky = true
)
## set up McMC
nsamples, nchains, nchainsatone = 50001, 4, 1
nsamples, nchains, nchainsatone = 5001, 4, 1
Tmax = 2.50
addprocs(nchains)
@info "workers are $(workers())"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using transD_GP, Distributed
## make options for the stationary GP
fileprefix = "OrstUhn_"
K = transD_GP.GP.OrstUhn()
Expand Down
1 change: 1 addition & 0 deletions examples/AEM_MT_joint/AEM_only/03_run_aem_inversion_s.jl
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using Distributed
## set up McMC
nsamples, nchains, nchainsatone = 100001, 5, 1
Tmax = 2.50
Expand Down
5 changes: 4 additions & 1 deletion examples/AEM_MT_joint/MT_only/allfreqs/01_make_synthetic.jl
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ z, ρ, nfixed = transD_GP.makezρ(zboundaries; zfixed=zfixed, ρfixed=ρfixed)
ρ[(z.>=120) .&(z.<140)] .= 2
ρ[(z.>=140) .&(z.<250)] .= 100.
ρ[(z.>=250) .&(z.<270)] .= 100.
ρ[(z.>=270)] .= 150
ρ[(z.>=270) .&(z.<600)] .= 150
ρ[(z.>=600) .&(z.<800)] .= 2
ρ[(z.>=800) .&(z.<5000)] .= 500
ρ[z.>=5000] .= 700
# add jitter to model in log10 domain
Random.seed!(11)
ρ[1:50] = 10 .^(0.1*randn(length(ρ[1:50])) + log10.(ρ[1:50]))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## set up McMC
using Distributed
nsamples, nchains, nchainsatone = 300001, 4, 1
nsamples, nchains, nchainsatone = 100001, 4, 1
Tmax = 2.50
addprocs(nchains)
@info "workers are $(workers())"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ z, ρ, nfixed = transD_GP.makezρ(zboundaries; zfixed=zfixed, ρfixed=ρfixed)
ρ[(z.>=120) .&(z.<140)] .= 2
ρ[(z.>=140) .&(z.<250)] .= 100.
ρ[(z.>=250) .&(z.<270)] .= 100.
ρ[(z.>=270)] .= 150
ρ[(z.>=270) .&(z.<600)] .= 150
ρ[(z.>=600) .&(z.<800)] .= 2
ρ[(z.>=800) .&(z.<5000)] .= 500
ρ[z.>=5000] .= 700
# add jitter to model in log10 domain
Random.seed!(11)
ρ[1:50] = 10 .^(0.1*randn(length(ρ[1:50])) + log10.(ρ[1:50]))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## set up McMC
using Distributed
nsamples, nchains, nchainsatone = 300001, 4, 1
nsamples, nchains, nchainsatone = 100001, 4, 1
Tmax = 2.50
addprocs(nchains)
@info "workers are $(workers())"
Expand Down
42 changes: 0 additions & 42 deletions examples/AEM_MT_joint/MT_only/limitedfreqs1/01_make_synthetic.jl

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## set up McMC
using Distributed
nsamples, nchains, nchainsatone = 300001, 4, 1
nsamples, nchains, nchainsatone = 100001, 4, 1
Tmax = 2.50
addprocs(nchains)
@info "workers are $(workers())"
Expand Down
18 changes: 0 additions & 18 deletions examples/AEM_MT_joint/MT_only/useful/04_plot_results.jl

This file was deleted.

Loading

0 comments on commit d2ffa8b

Please sign in to comment.