Refactoring and test fix

Author: kaipartmann

src/core/study.jl

@@ -199,14 +199,10 @@ function submit!(study::Study; kwargs...)
     # If logfile exists, refresh sim_success and append a resume marker. Otherwise
     # create a new logfile with header.
     if isfile(study.logfile)
-        try
-            update_sim_success_from_log!(study)
-        catch err
-            @warn "failed to refresh study status from existing logfile" error=err
-        end
+        update_sim_success_from_log!(study)
         open(study.logfile, "a") do io
             datetime = Dates.format(Dates.now(), "yyyy-mm-dd, HH:MM:SS")
-            write(io, "\n--- RESUMED: $datetime ---\n\n")
+            write(io, "\n\n--- RESUMED: $datetime ---\n\n")
         end
     else
         open(study.logfile, "w+") do io
@@ -233,11 +229,12 @@ function submit!(study::Study; kwargs...)
             end
             continue
         end
-        success = false
         simtime = @elapsed begin
-            try
+            success = try
+                # remove the vtk files from previous failed runs if any
+                isdir(job.options.vtk) && rm(job.options.vtk; force=true, recursive=true)
                 submit(job; kwargs...)
-                success = true
+                true
             catch err
                 # Try to log the error to the job's logfile, but if that fails
                 # (e.g., invalid path), just continue
@@ -248,6 +245,7 @@ function submit!(study::Study; kwargs...)
                 catch
                     # If logging fails, just continue - error will be recorded in job log
                 end
+                false
             end
         end
         study.sim_success[i] = success
@@ -277,7 +275,7 @@ last recorded status for each job. This allows resuming processing or submission
 after an interrupted run.
 """
 function update_sim_success_from_log!(study::Study)
-    isfile(study.logfile) || return false
+    isfile(study.logfile) || return nothing
 
     # Read logfile line by line
     lines = readlines(study.logfile)
@@ -319,7 +317,7 @@ function update_sim_success_from_log!(study::Study)
             study.sim_success[i] = false
         end
     end
-    return true
+    return nothing
 end
 
 """
@@ -383,13 +381,7 @@ See also: [`Study`](@ref), [`submit!`](@ref)
 """
 function process_each_job(f::F, study::Study, default_result::NamedTuple) where {F}
     # Refresh sim_success from logfile if it exists (in case study was interrupted/resumed)
-    if isfile(study.logfile)
-        try
-            update_sim_success_from_log!(study)
-        catch err
-            @warn "failed to refresh study status from logfile before processing" error=err
-        end
-    end
+    isfile(study.logfile) && update_sim_success_from_log!(study)
 
     results = fill(default_result, length(study.jobs))
     for (i, job) in enumerate(study.jobs)

test/core/test_study.jl

@@ -85,7 +85,8 @@ end
     mkpath(study.jobpaths[1])
     open(study.logfile, "w") do io
         write(io, "SIMULATION STUDY LOGFILE\n\n")
-        write(io, "Simulation `$(study.jobpaths[1])`:\n  status: completed ✓ (0.00 seconds)\n\n")
+        write(io, "Simulation `$(study.jobpaths[1])`:\n")
+        write(io, "  status: completed ✓ (0.00 seconds)\n\n")
     end
 
     # Now resuming submit! should only run the remaining job (E=2)
@@ -283,6 +284,9 @@ end
 end
 
 @testitem "Study with MultibodySetup" begin
+    __mpi_run__ = Peridynamics.MPI_RUN[]
+    Peridynamics.MPI_RUN[] = false
+
     function create_job(setup::NamedTuple, root::String)
         b1 = Body(BBMaterial(), rand(3, 50), rand(50))
         material!(b1, horizon=1, E=1, rho=1, Gc=1)
@@ -306,6 +310,8 @@ end
 
     Peridynamics.submit!(study)
     @test study.sim_success[1] == true
+
+    Peridynamics.MPI_RUN[] = __mpi_run__
 end
 
 @testitem "Study logfile format and content" begin