From c63993ca9ca3262f5425a75629b5a9605c57f1c2 Mon Sep 17 00:00:00 2001 From: Nathanael Wong Date: Sun, 13 Oct 2024 23:38:58 -0400 Subject: [PATCH] Updating scripts and functions --- scripts/modifysam/modifyprm.jl | 4 ++-- scripts/modifysam/modifyrun.jl | 2 +- src/sam.jl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/modifysam/modifyprm.jl b/scripts/modifysam/modifyprm.jl index bd1c085..b10a797 100644 --- a/scripts/modifysam/modifyprm.jl +++ b/scripts/modifysam/modifyprm.jl @@ -8,7 +8,7 @@ include(srcdir("sam.jl")) schname = "DGW" expname = "P1282km300V64" -if schname == "DGW" +if (schname == "DGW") || (schname == "LGW") wtgvec = [0.02,0.05,0.1,0.2,0.5,1,2,5,10,20,50,100,200,500] else wtgvec = [sqrt(2),2,2*sqrt(2.5),5,5*sqrt(2)] @@ -20,7 +20,7 @@ tprm = projectdir("exp","tmp.prm") for wtgii in wtgvec wtgstring = powername(wtgii,schname) - if schname == "DGW" + if (schname == "DGW") || (schname == "LGW") wtgdmp = wtgii; wtgrlx = 1 else; wtgrlx = wtgii; wtgdmp = 1 end diff --git a/scripts/modifysam/modifyrun.jl b/scripts/modifysam/modifyrun.jl index c82c003..2196639 100644 --- a/scripts/modifysam/modifyrun.jl +++ b/scripts/modifysam/modifyrun.jl @@ -9,7 +9,7 @@ expname = "P1282km300V64" email = "" doBuild = true -if schname == "DGW" +if (schname == "DGW") || (schname == "LGW") pwrvec = [0.02,0.05,0.1,0.2,0.5,1,2,5,10,20,50,100,200,500] else pwrvec = [sqrt(2),2,2*sqrt(2.5),5,5*sqrt(2)] diff --git a/src/sam.jl b/src/sam.jl index 3ec651b..2e47285 100644 --- a/src/sam.jl +++ b/src/sam.jl @@ -11,7 +11,7 @@ function powername( scheme :: AbstractString ) - if scheme == "DGW" + if (scheme == "DGW") || (scheme == "LGW") return dampingstrprnt(power) else return relaxscalestrprnt(power)