get id mode fill

Author: milankl

src/DefaultParameters.jl

@@ -98,6 +98,7 @@
     initpath::String=outpath            # folder where to pick the restart files from
     init_run_id::Int=0                  # run id for restart from run number
     init_starti::Int=-1                 # timestep to start from (-1 meaning last)
+    get_id_mode::String="continue"      # "continue" or "fill"
 
     # ASSERT - CHECK THAT THE INPUT PARAMETERS MAKE SENSE
     @assert all((nx,Lx,L_ratio) .> 0.)  "nx, Lx, L_ratio have to be >0"
@@ -130,4 +131,5 @@
     @assert initial_cond in ["rest", "ncfile"] "Initial conditions '$initial_cond' unsupported."
     @assert init_run_id >= 0 "Initial condition run id, init_run_id, has to be >= 0, $init_run_id given."
     @assert init_starti > 0 || init_starti == -1 "Start index, init_starti, has to be >0 || -1, $init_starti given."
+    @assert get_id_mode in ["continue","fill"] "get_id_mode $get_id_mode unsupported."
 end

src/Output.jl

@@ -145,12 +145,10 @@ function gap(a::Array{Int,1})
 end
 
 """Checks output folders to determine a 4-digit run id number."""
-function get_run_id_path(   S::ModelSetup,
-                            order::String="continue",
-                            run_id::Union{Int,Nothing}=nothing)
-
-    @unpack output,outpath = S.parameters
+function get_run_id_path(S::ModelSetup)
 
+    @unpack output,outpath,get_id_mode = S.parameters
+    
     if output
         runlist = filter(x->startswith(x,"run"),readdir(outpath))
         existing_runs = [parse(Int,id[4:end]) for id in runlist]
@@ -159,26 +157,26 @@ function get_run_id_path(   S::ModelSetup,
             mkdir(runpath)
             return 0,runpath
         else                                    # create next folder
-            if order == "fill"  # find the smallest gap in runfolders
+            if get_id_mode == "fill"  # find the smallest gap in runfolders
                 run_id = gap(existing_runs)
                 runpath = joinpath(outpath,"run"*@sprintf("%04d",run_id))
                 mkdir(runpath)
 
-            elseif order == "specific" # specify the run_id as input argument
-                runpath = joinpath(outpath,"run"*@sprintf("%04d",run_id))
-                try # create folder if not existent
-                    mkdir(runpath)
-                catch # else rm folder and create new one
-                    rm(runpath,recursive=true)
-                    mkdir(runpath)
-                end
+            # elseif order == "specific" # specify the run_id as input argument
+            #     runpath = joinpath(outpath,"run"*@sprintf("%04d",run_id))
+            #     try # create folder if not existent
+            #         mkdir(runpath)
+            #     catch # else rm folder and create new one
+            #         rm(runpath,recursive=true)
+            #         mkdir(runpath)
+            #     end
 
-            elseif order == "continue" # find largest folder and count one up
+            elseif get_id_mode == "continue" # find largest folder and count one up
                 run_id = maximum(existing_runs)+1
                 runpath = joinpath(outpath,"run"*@sprintf("%04d",run_id))
                 mkdir(runpath)
             else
-                throw(error("Order '$order' is not valid for get_run_id_path(), chose continue, specific or fill."))
+                throw(error("Order '$get_id_mode' is not valid for get_run_id_path(), choose continue or fill."))
             end
             return run_id,runpath
         end

src/RunModel.jl

@@ -10,7 +10,7 @@ julia> u,v,η,sst = RunModel(Float64,nx=200,output=true)
 ```
 """
 function RunModel(::Type{T}=Float32;     # number format
-    kwargs...                           # all additional parameters
+    kwargs...                            # all additional parameters
     ) where {T<:AbstractFloat}
 
     P = Parameter(T=T;kwargs...)