Update some scripts and functions

natgeo-wong · Nov 2, 2024 · 30add2c · 30add2c
1 parent 2a3d946
commit 30add2c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git 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") || (schname == "LGW")
+if checkschemeDGW(schname)
     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") || (schname == "LGW")
+    if checkschemeDGW(schname)
           wtgdmp = wtgii; wtgrlx = 1
     else; wtgrlx = wtgii; wtgdmp = 1
     end

diff --git a/scripts/modifysam/modifyrun.jl b/scripts/modifysam/modifyrun.jl
@@ -9,7 +9,7 @@ expname = "P1282km300V64"
 email   = ""
 doBuild = true
 
-if (schname == "DGW") || (schname == "LGW")
+if checkschemeDGW(schname)
     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
@@ -10,15 +10,23 @@ function powername(
     power  :: Real,
     scheme :: AbstractString
 )
-
-    if (scheme == "DGW") || (scheme == "LGW")
+    
+    if checkschemeDGW(scheme)
         return dampingstrprnt(power)
     else
         return relaxscalestrprnt(power)
     end
 
 end
 
+function checkschemeDGW(scheme::AbstractString)
+    if (scheme == "DGW") || (scheme == "KGW") || (scheme == "TDG")
+        return true
+    else
+        return false
+    end
+end
+
 function outstatname(
     scheme  :: AbstractString,
     expname :: AbstractString,