dg1d: make `main` accept paths to output directories...

dg1d: make `main` accept paths to output directories (!196)

src/main.jl

@@ -19,16 +19,22 @@ function testparfiles()
 end
 
 
-function normalize_parfile(filename)
+function normalize_parfile(path::AbstractString)
+  filename = if isdir(path)
+    name = basename(path)
+    fname = joinpath(path, string(name, ".toml"))
+  else
+    path
+  end
   if !isfile(filename)
-    error("Cannot locate parameter file '$filename'")
+    error("Cannot locate a parameter file at $path")
   end
   return filename
 end
 function normalize_parfile(nr::Integer)
   testpars = get_testparfiles()
   if !(1 <= nr <= length(testpars))
-    error("there is no test parfile with nr $nr")
+    error("There is no test parfile with nr $nr, see testparfiles() for available parfiles")
   end
   parfile = testpars[nr]
   path = normpath(joinpath(@__DIR__, "..", "test", "IntegrationTests", "refs", parfile, "$parfile.toml"))
@@ -41,7 +47,7 @@ end
 
 Run program specified by a `parfile` in TOML format.
 """
-function main(parfile, parameter_overrides::Pair{String,String}...)
+function the_main(parfile::String, parameter_overrides::Pair{String,String}...)
 
   parfile = abspath(parfile)
   prms = TOML.parsefile(parfile)
@@ -107,8 +113,9 @@ function main(parfile, parameter_overrides::Pair{String,String}...)
 
   return
 end
-main(id::Integer, parameter_overrides::Pair{String,String}...) =
-  main(normalize_parfile(id); parameter_overrides)
+
+main(p::Union{Integer,AbstractString}, parameter_overrides::Pair{String,String}...) =
+  the_main(normalize_parfile(p), parameter_overrides...)
 
 load_parameters(parfile::AbstractString) = parse_parameters(TOML.parsefile(parfile))
 

src/utils.jl

@@ -199,8 +199,6 @@ function make_outputdir(path)
 
   lastext == "toml" || error("Only accept parameter files in .toml format, received '$path'")
 
-  isfile(path) || error("Parameter file '$path' not found")
-
   outputdirname = basename
   if length(firstexts) > 0
     outputdirname = "$basename.$(join(firstexts, '.'))"

test/UnitTests/src/test_utils.jl

@@ -347,7 +347,8 @@ end
     end
 
     nofilethere = joinpath(dir, "nofilethere.toml")
-    @test_throws ErrorException dg1d.make_outputdir(nofilethere)
+    dg1d.make_outputdir(nofilethere)
+    @test isdir(first(splitext(nofilethere)))
 
     wrongextensionfile = joinpath(dir, "wrongextension.toml.blabla")
     touch(wrongextensionfile)