commit 428a5b9351b4ccbdec20a644864c7df027508483
parent 82ab31b51e36a7d1a877fa3794335b800de835d7
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date: Mon, 24 Jun 2019 10:17:22 +0200
Remove unneeded files, rename manuscript file
Diffstat:
15 files changed, 2 insertions(+), 103 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
-NAME=notes
-DEPS=$(NAME).tex critical_state_porosity.pdf
+NAME=continuum-granular-manuscript1
+DEPS=$(NAME).tex
$(NAME).pdf: $(DEPS) BIBnew.bib ~/articles/own/BIBnew.bib
latexmk -pdf $(NAME).tex
@@ -13,10 +13,6 @@ auto: $(DEPS)
view: $(NAME).pdf
xdg-open $< &
-.phony: upload
-upload: $(NAME).pdf
- scp $< ad@debvm:/var/www/html/
-
BIBnew.bib: $(NAME).tex
cp ~/articles/own/BIBnew.bib $@
diff --git a/notes.tex b/continuum-granular-manuscript1.tex
diff --git a/dilation_analysis/critical_state_porosity.jl b/dilation_analysis/critical_state_porosity.jl
@@ -1,53 +0,0 @@
-#!/usr/bin/env julia
-
-import PyPlot
-
-function volume_fraction_forterre_pouliquen_2008(I)
- # Summarized in Forterre and Pouliquen 2008
- Φ_max = 0.6
- Φ_min = 0.4
- return Φ_max .+ (Φ_min - Φ_max).*I
-end
-
-function porosity_forterre_pouliquen_2008(I)
- # Summarized in Forterre and Pouliquen 2008
- ϕ_min = 1.0 - 0.6
- ϕ_max = 1.0 - 0.4
- return ϕ_min .+ (ϕ_max - ϕ_min).*I
-end
-
-function volume_fraction_gdr_midi_2004(I)
- # GDR-MiDi 2004, fig 2f
- Φ_max = 0.84
- Φ_min = -0.50
- return Φ_max .+ (Φ_min - Φ_max).*I
-end
-
-
-## General variables
-# γ is the magnitude of shear strain
-#γ = range(0.0, stop=1.0, length=100)
-
-I = range(5e-4, stop=2e-1, length=1000)
-
-PyPlot.clf()
-#for p in 0.8:0.05:1.1
-#PyPlot.plot(I, volume_fraction(I))
-PyPlot.semilogx(I, volume_fraction_gdr_midi_2004(I),
- label="GDR-MiDi 2004 (2D discs), \$\\Phi_{min}\$ = 0.84, \$\\Phi_{min}\$ = -0.5")
-PyPlot.semilogx(I, volume_fraction_forterre_pouliquen_2008(I),
- label="Forterre and Pouliquen 2008 (3D spheres), \$\\Phi_{max}\$ = 0.6, \$\\Phi_{min}\$ = 0.4")
-PyPlot.semilogx(I, porosity_forterre_pouliquen_2008(I),
- label="Forterre and Pouliquen 2008 (3D spheres), \$\\phi_{max}\$ = 0.6, \$\\phi_{min}\$ = 0.4")
-#end
-PyPlot.xlim(5e-4, 2e-1)
-#PyPlot.ylim(0.50, 0.85)
-PyPlot.ylim(0.30, 0.85)
-PyPlot.title("\$\\Phi(I) = \\Phi_{max} + (\\Phi_{min} - \\Phi_{max})I\$")
-PyPlot.legend()
-PyPlot.xlabel("Inertia number, \$I\$ [-]")
-PyPlot.ylabel("Mean volume fraction, \$\\Phi\$ [-]")
-PyPlot.savefig("critical_state_porosity.png")
-PyPlot.savefig("critical_state_porosity.pdf")
-
-println(porosity_forterre_pouliquen_2008(I) .+ volume_fraction_forterre_pouliquen_2008(I))
diff --git a/dilation_analysis/critical_state_porosity.pdf b/dilation_analysis/critical_state_porosity.pdf
Binary files differ.
diff --git a/dilation_analysis/critical_state_porosity.png b/dilation_analysis/critical_state_porosity.png
Binary files differ.
diff --git a/dilation_analysis/d_1-Lambda1.0.png b/dilation_analysis/d_1-Lambda1.0.png
Binary files differ.
diff --git a/dilation_analysis/d_1-Lambda2.0.png b/dilation_analysis/d_1-Lambda2.0.png
Binary files differ.
diff --git a/dilation_analysis/d_1-Lambda3.0.png b/dilation_analysis/d_1-Lambda3.0.png
Binary files differ.
diff --git a/dilation_analysis/d_1-Lambda4.0.png b/dilation_analysis/d_1-Lambda4.0.png
Binary files differ.
diff --git a/dilation_analysis/d_1-Lambda5.0.png b/dilation_analysis/d_1-Lambda5.0.png
Binary files differ.
diff --git a/dilation_analysis/d_1-Lambda6.0.png b/dilation_analysis/d_1-Lambda6.0.png
Binary files differ.
diff --git a/dilation_analysis/d_1-Lambda7.0.png b/dilation_analysis/d_1-Lambda7.0.png
Binary files differ.
diff --git a/dilation_analysis/d_1-Lambda8.0.png b/dilation_analysis/d_1-Lambda8.0.png
Binary files differ.
diff --git a/dilation_analysis/d_1-Lambda9.0.png b/dilation_analysis/d_1-Lambda9.0.png
Binary files differ.
diff --git a/dilation_analysis/dilation_equation.jl b/dilation_analysis/dilation_equation.jl
@@ -1,44 +0,0 @@
-#!/usr/bin/env julia
-
-import PyPlot
-
-## Dilation kernels (d_*)
-# Describe the relative dilation and asymptote to 1 with increasing shear strain
-# (γ).
-
-"""
- d_1(γ::Vector{Float64}, Λ::Float64, p::Float64)
-
-Derived from Schoof's regularized function, (eq. 2.9 in Schoof 2010). When γ
-goes to infinity, this function nonlinearly approaches one.
-
-# Arguments
-* `γ::Vector{Float64}`: input array of shear strain values
-* `Λ::Float64`: parameter to control how fast convergence to 1 takes place
-* `p::Float64`: consolidation parameter. Values less than one result in
- underconsolidated behavior, where strain compaction occurs. Values larger
- then one result in overconsolidated behavior, where strain dilation occurs.
-
-"""
-function d_1(γ, Λ::Float64, p::Float64)
- return (γ ./ (γ .+ Λ^-1.0)).^(p - 1.0)
-end
-
-
-## General variables
-# γ is the magnitude of shear strain
-γ = range(0.0, stop=1.0, length=100)
-
-
-for Λ in 1.0:1.0:9.0
- PyPlot.clf()
- for p in 0.8:0.05:1.1
- PyPlot.plot(γ, d_1(γ, Λ, p), label="Λ = $(Λ), p = $(p)")
- end
- PyPlot.ylim(0.0, 2.5)
- PyPlot.title("d_1")
- PyPlot.legend()
- PyPlot.xlabel("Shear strain, γ [-]")
- PyPlot.ylabel("Relative dilation, d [-]")
- PyPlot.savefig("d_1-Lambda$(Λ).png")
-end
