minor changes

Author: RaulDurand

examples/mech/truss.jl

@@ -25,7 +25,7 @@ addstage!(model, bcs)
 solve!(model)
 
 mchart = MeshChart(model, 
-    field = :sX,
+    field = :σx´,
     colormap = :coolwarm,
     label = L"\sigma_x",
     warp = 100

src/mech/mech-modal-solver.jl

@@ -88,8 +88,6 @@ function mech_modal_solver!(ana::MechModalAnalysis, stage::Stage; kwargs...)
 
     # todo: check there are not force boundary conditions
 
-    @show 100
-
     # get only bulk elements # todo: improve this
     model = FEModel(model.elems.bulks)
 
@@ -115,9 +113,6 @@ function mech_modal_solver!(ana::MechModalAnalysis, stage::Stage; kwargs...)
         dof.vals[dof.natname] = 0.0
     end
 
-    @show 200
-
-
     K11 = mount_K(model.elems, ndofs)[1:nu, 1:nu]
     M11 = mount_M(model.elems, ndofs)[1:nu, 1:nu]
 
@@ -142,15 +137,13 @@ function mech_modal_solver!(ana::MechModalAnalysis, stage::Stage; kwargs...)
     # eingenvalues and eingenvectors
     # Eig = eigs(P, nev=nmodes, which=:SR, tol=1e-6, maxiter=600, check=1) # SR: smallest real part
     # nenv = size(P,2) - 2
-    @show 300
 
     # Eig = eigs(P, nev=nmodes, which=:SM, tol=1e-6, ncv=min(2*nmodes, nenv), check=1) # SM: smallest magnitude
     λ, V = eigs(P, nev=nmodes, which=:SM, tol=1e-6, check=1, maxiter=10000) # SM: smallest magnitude
     # Eig = eigs(P, nev=nmodes, which=:LM) # LM: largest magnitude
     # w0  = λ # frequencies
     # λ  = copy(w0)
 
-    @show 400
 
     # @show wi
     # @show wi

src/mesh/genmesh.jl

@@ -3,7 +3,7 @@
 Mesh_Geo_params = [
     FunInfo(:Mesh, "Creates a `Mesh` structure from a `GeoModel` object."),
     ArgInfo(:geo, "GeoModel object"),
-    KwArgInfo(:ndim, "Mesh dimension hint", 1),
+    KwArgInfo(:ndim, "Mesh dimension hint", nothing),
     KwArgInfo(:size, "Characteristic length for meshing", 0.1),
     KwArgInfo(:quadratic, "Flag for quadratic cells (gmsh)", false),
     KwArgInfo(:algorithm, "Algorithm for triangulation (gmsh)", :delaunay),
@@ -17,7 +17,6 @@ Mesh_Geo_params = [
 function Mesh(geo::GeoModel; kwargs...)
     args = checkargs([geo], kwargs, Mesh_Geo_params)
     quiet = args.quiet
-    ndim  = args.ndim
 
     # check for blocks
     blocks  = [ b for b in geo.blocks if b isa Block ]
@@ -35,11 +34,15 @@ function Mesh(geo::GeoModel; kwargs...)
     elseif length(blocks)>0
         !quiet && printstyled("Structured mesh generation:\n", bold=true, color=:cyan)
         mesh = mesh_structured(geo)
-        mesh.ctx.ndim = ndim
+        # mesh.ctx.ndim = ndim
     else
         error("Mesh: No blocks or surfaces/volumes found")
     end
 
+    if args.ndim != nothing
+        mesh.ctx.ndim = max(args.ndim, mesh.ctx.ndim)
+    end
+
     if length(geo.subpaths)>0
         gen_insets!(mesh, geo.subpaths)
         synchronize!(mesh)

src/plot/line-chart.jl

@@ -30,6 +30,7 @@ Chart_params = [
     KwArgInfo( :colorbar_label, "Label for the colorbar", "" ),
     KwArgInfo( :colorbar_limits, "Range of values in the colorbar", Float64[0.0,0.0], length=2 ),
     KwArgInfo( :colorbar_font_size, "Font size for the colorbar labels", 7.0, cond=:(colorbar_font_size>0)),
+    KwArgInfo(:quiet, "Flag to set silent mode", false),
 ]
 @doc docstring(Chart_params) Chart
 
@@ -53,6 +54,8 @@ mutable struct Chart<:Figure
     icolor::Int
     iorder::Int
     args::NamedTuple
+    
+    quiet::Bool
 
     function Chart(; args...)
         args = checkargs(args, Chart_params, aliens=false)
@@ -69,6 +72,14 @@ mutable struct Chart<:Figure
         this.iorder = 1
         this.args = args
 
+        this.quiet = args.quiet
+
+        if !this.quiet 
+            printstyled("Chart figure\n", bold=true, color=:cyan)
+            println("  size: $(this.width) x $(this.height) dpi")
+            println("  axes: $(args.x_label) vs $(args.y_label)")
+        end
+
         return this
     end
 end

src/plot/text.jl

@@ -40,7 +40,7 @@ function fix_tex_elems!(elems)
     end
 
     # fix spacement for × character
-    pos = findfirst(elem -> elem[1].represented_char == '×', elems)
+    pos = findfirst(elem -> !(elem[1] isa HLine) && elem[1].represented_char == '×', elems)
     if pos !== nothing && pos < length(elems)
         elem = elems[pos]
         point = typeof(elem[2])(elem[2][1] - 0.07, elem[2][2])

test/dynamic/modal-bathe.jl

@@ -46,7 +46,7 @@ mesh=Mesh(bl1, bl2, bl3, bl4, bl5, bl6, bl7, bl8, bl9, bl10, bl21, bl11, bl12, b
 mats = [
     :solids => MechSolid => DruckerPrager => (E=Ec, nu=0.2, rho=roc, alpha=0.4312, kappa=3771.2),
     :lines  => MechBar => LinearElastic => (E=Ea, A=Aa, rho=roa),
-    :joints1d => MechLSJoint => ElasticLSJoint => (ks=1.e7, kn=1.e7, p=p),
+    :joints1d => MechBondSlip => ElasticBondSlip => (ks=1.e7, kn=1.e7, p=p),
     # MaterialBind(:solids, DruckerPrager => (E=Ec, nu=0.2, rho=roc, alpha=0.4312, kappa=3771.2) ),
     # MaterialBind(:joints1D, ElasticJoint1D(ks=1.e7, kn=1.e7, A=Aa) ),
     # MaterialBind(:lines   , ElasticRod => (E=Ea, A=Aa, rho=roa) ),
@@ -55,7 +55,7 @@ mats = [
 matl = MaterialList()
 matl.add_material(:solids, MechSolid, DruckerPrager, E=Ec, nu=0.2, rho=roc, alpha=0.4312, kappa=3771.2)
 matl.add_material(:lines,  MechBar, LinearElastic, E=Ea, A=Aa, rho=roa)
-matl.add_material(:joints1d, MechLSJoint, ElasticLSJoint, ks=1.e7, kn=1.e7, p=p)
+matl.add_material(:joints1d, MechBondSlip, ElasticBondSlip, ks=1.e7, kn=1.e7, p=p)
 
 ctx   = MechContext()
 model = FEModel(mesh, mats, ctx)

test/mech/elem/inset/ceb.jl

@@ -22,7 +22,7 @@ tag!(msh.elems["solids"].nodes, "fixed_points")
 mats = [
         "solids" => MechSolid => LinearElastic => (E=24e3, nu=0.2),
         "bars"   => MechTruss => LinearElastic => (E=200e6, A=0.00011),
-        "joints" => MechRSJoint => CebLSJoint => (taumax=12, taures=3, s1=0.001, s2=0.0011, s3=0.004, alpha=0.5, beta=0.5,
+        "joints" => MechBondSlip => CebBondSlip => (taumax=12, taures=3, s1=0.001, s2=0.0011, s3=0.004, alpha=0.5, beta=0.5,
                                  ks=(12/0.001)*5, kn=5000, p=0.25)
        ]
 

test/mech/elem/inset/dowel.jl

@@ -29,8 +29,8 @@ mats = [
         # :lines => MechTruss => LinearElastic => (E=200e6, A=0.00011),
         :lines => MechBeam => LinearElastic => (E=200e6, A=0.00011),
 
-        :linejoints => MechLSJoint => LinearLSInterface => (kn=5000, ks=6000, p=0.25),
-        # :linejoints => MechLSJoint => CebLSInterface => (taumax=12, taures=3, s1=0.001, s2=0.0011, s3=0.004, alpha=0.5, beta=0.5, ks=(12/0.001)*5, kn=5000, p=0.25)
+        :linejoints => MechBondSlip => LinearBondSlip => (kn=5000, ks=6000, p=0.25),
+        # :linejoints => MechBondSlip => CebBondSlip => (taumax=12, taures=3, s1=0.001, s2=0.0011, s3=0.004, alpha=0.5, beta=0.5, ks=(12/0.001)*5, kn=5000, p=0.25)
        ]
 
 ctx = MechContext(stressmodel=:planestress)

test/mech/elem/inset/tip.jl

@@ -17,8 +17,8 @@ save(msh, "mesh.vtk")
 mats = [
         "solids" => MechSolid => LinearElastic => (E=24e3, nu=0.2),
         "bars"   => MechBar => LinearElastic => (E=200e6, A=0.00011),
-        "joints" => MechRSJoint => CebLSJoint => (taumax=12, taures=3, s1=0.001, s2=0.0011, s3=0.004, alpha=0.5, beta=0.5, ks=(12/0.001)*5, kn=5000, p=0.25),
-        "tips"   => MechTipJoint => TipContact => (k=1e8, fixed=false)
+        "joints" => MechBondSlip => CebBondSlip => (taumax=12, taures=3, s1=0.001, s2=0.0011, s3=0.004, alpha=0.5, beta=0.5, ks=(12/0.001)*5, kn=5000, p=0.25),
+        "tips"   => MechSlipTip => LinearTipContact => (k=1e8, fixed=false)
        ]
 
 ctx = MechContext()

test/mech/elem/joint/joint1d.jl

@@ -14,7 +14,7 @@ mesh = Mesh(bls)
 
 mats = [
     "solids" => MechSolid => LinearElastic => (E=1.e4, nu=0.),
-    "joints" => MechRSJoint => ElasticRSJoint => (ks=1.e5, kn=1.e5, p=0.25), 
+    "joints" => MechBondSlip => ElasticRSJoint => (ks=1.e5, kn=1.e5, p=0.25), 
     "bars"   => MechBar => LinearElastic => (E=1.e8, A=0.005),
 ]