refac

Author: JTHesse

src/IO/logging.jl

@@ -262,36 +262,43 @@ function init_logging(filename::String, debug::Bool, silent::Bool, rank::Int64,
 end
 
 function get_current_git_info(repo_path::AbstractString = ".")
-    repo = LibGit2.GitRepo(repo_path)
-    head_name = LibGit2.headname(repo)
-    head_oid = LibGit2.head_oid(repo)
-    dirty = LibGit2.isdirty(repo)
-    tag_list = LibGit2.tag_list(repo)
-
+    dirty = false
     info = ""
     qa_vector = ["", ""]
 
-    if head_name == "main"
-        info *= "Commit: $(string(head_oid)[1:7])"
-        qa_vector[1] = "Commit: $(string(head_oid)[1:7])"
-    else
-        info *= "Branch: $head_name, Commit: $(string(head_oid)[1:7])"
-        qa_vector[1] = "Commit: $(string(head_oid)[1:7])"
-        qa_vector[2] = "Branch: $(string(head_name)[1:24])"
-    end
+    try
+        repo = LibGit2.GitRepo(repo_path)
+        head_name = LibGit2.headname(repo)
+        head_oid = LibGit2.head_oid(repo)
+        dirty = LibGit2.isdirty(repo)
+        tag_list = LibGit2.tag_list(repo)
 
-    for tag in tag_list
-        tag_hash = LibGit2.target(LibGit2.GitObject(repo, tag))
-        if tag_hash == head_oid
-            info *= ", Tag: $tag"
-            qa_vector[1] = "Tag: $tag"
-            break
+        if head_name == "main"
+            info *= "Commit: $(string(head_oid)[1:7])"
+            qa_vector[1] = "Commit: $(string(head_oid)[1:7])"
+        else
+            info *= "Branch: $head_name, Commit: $(string(head_oid)[1:7])"
+            qa_vector[1] = "Commit: $(string(head_oid)[1:7])"
+            qa_vector[2] = "Branch: $(string(head_name)[1:24])"
         end
-    end
 
-    if dirty
-        info *= ", Local changes detected"
-        qa_vector[2] = "Local changes detected"
+        for tag in tag_list
+            tag_hash = LibGit2.target(LibGit2.GitObject(repo, tag))
+            if tag_hash == head_oid
+                info *= ", Tag: $tag"
+                qa_vector[1] = "Tag: $tag"
+                break
+            end
+        end
+
+        if dirty
+            info *= ", Local changes detected"
+            qa_vector[2] = "Local changes detected"
+        end
+    catch e
+        if isa(e, LibGit2.GitError)
+            @warn "No current git info."
+        end
     end
     return dirty, info, qa_vector
 end

src/Models/Material/Material_Models/BondBased/1D_Bondbased_Elastic.jl

@@ -66,7 +66,7 @@ Calculate the elastic bond force for each node.
 - `time::Float64`: The current time.
 - `dt::Float64`: The current time step.
 """
-function compute_model(odes::AbstractVector{Int64},
+function compute_model(nodes::AbstractVector{Int64},
                        material_parameter::Dict{String,Any},
                        block::Int64,
                        time::Float64,

src/PeriLab.jl

@@ -241,7 +241,6 @@ function main(filename::String;
 
         result_files = nothing
         outputs = nothing
-        qa_vector::Vector{String} = []
 
         try
             # atexit(() -> cleanup(comm))
@@ -250,26 +249,20 @@ function main(filename::String;
                 silent = false
             end
             Logging_Module.init_logging(filename, debug, silent, rank, size)
+            dirty,
+            git_info,
+            qa_vector = Logging_Module.get_current_git_info(joinpath(@__DIR__,
+                                                                     ".."))
             if rank == 0
                 if !silent
                     print_banner(size > 1)
                 end
                 @info "\n PeriLab version: $PERILAB_VERSION\n Copyright: Dr.-Ing. Christian Willberg, M.Sc. Jan-Timo Hesse\n Contact: christian.willberg@dlr.de, jan-timo.hesse@dlr.de\n GitHub: https://github.com/PeriHub/PeriLab.jl\n DOI: 10.1016/j.softx.2024.101700\n License: BSD-3-Clause\n ---------------------------------------------------------------\n"
                 @info Dates.format(Dates.now(), "yyyy-mm-dd HH:MM:SS")
-                try
-                    dirty,
-                    git_info,
-                    qa_vector = Logging_Module.get_current_git_info(joinpath(@__DIR__,
-                                                                             ".."))
-                    if dirty
-                        @warn git_info
-                    else
-                        @info git_info
-                    end
-                catch e
-                    if isa(e, LibGit2.GitError)
-                        @warn "No current git info."
-                    end
+                if dirty
+                    @warn git_info
+                else
+                    @info git_info
                 end
                 if size > 1
                     @info "MPI: Running on " * string(size) * " processes"