Changeset 26728

Timestamp:

12/09/21 11:10:33 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: some reorg

File:

• issm/trunk-jpl/src/jl/usr/classes.jl (modified) (10 diffs)

issm/trunk-jpl/src/jl/usr/classes.jl

@@ -1 +1 @@
 using Printf
 
+#Model fields
+#Mesh {{{
 abstract type AbstractMesh end
 mutable struct Mesh2dTriangle <: AbstractMesh
@@ -31 +33 @@
         return Mesh3dPrism( 0, 0, 0, Vector{Float64}(undef,0), Vector{Float64}(undef,0), Vector{Float64}(undef,0), Matrix{Int64}(undef, 0, 0), Matrix{Int64}(undef, 0, 0), Vector{Bool}(undef,0))
 end# }}}
-
+#}}}
+#Geometry{{{
 mutable struct Geometry
         surface::Vector{Float64}
@@ -41 +44 @@
         return Geometry( Vector{Float64}(undef,0), Vector{Float64}(undef,0), Vector{Float64}(undef,0), Vector{Float64}(undef,0))
 end# }}}
-
+function Base.show(io::IO, this::Geometry)# {{{
+        IssmStructDisp(io, this)
+end# }}}
+#}}}
+#Mask {{{
 mutable struct Mask
         ocean_levelset::Vector{Float64}
@@ -52 +59 @@
         IssmStructDisp(io, this)
 end# }}}
-
+#}}}
+#Initialization{{{
 mutable struct Initialization
         vx::Vector{Float64}
@@ -60 +68 @@
         return Initialization( Vector{Float64}(undef,0), Vector{Float64}(undef,0))
 end# }}}
-
+function Base.show(io::IO, this::Initialization)# {{{
+        IssmStructDisp(io, this)
+end# }}}
+#}}}
+#Stressbalance {{{
 mutable struct Stressbalance
         spcvx::Vector{Float64}
@@ -75 +87 @@
         IssmStructDisp(io, this)
 end# }}}
-
+#}}}
+#Constants{{{
 mutable struct Constants
         g::Float64
@@ -83 +96 @@
         return Constants( 9.81,  365*24*3600.)
 end# }}}
-
+function Base.show(io::IO, this::Constants)# {{{
+        IssmStructDisp(io, this)
+end# }}}
+# }}}
+#Materials {{{
 mutable struct Materials
         rho_ice::Float64
@@ -105 +122 @@
         return Materials(917., 1023., 1000., 0.001787, 2093., 3.34*10^5, 2.4, .24, 1, 273.15, 9.8*10^-8, 3974., 1.00*10^-4, Vector{Float64}(undef,0), Vector{Float64}(undef,0), "Cuffey")
 end# }}}
-
+function Base.show(io::IO, this::Materials)# {{{
+        IssmStructDisp(io, this)
+end# }}}
+# }}}
+#Friction {{{
 abstract type AbstractFriction end
 mutable struct BuddFriction <: AbstractFriction
@@ -120 +141 @@
         m::Vector{Float64}
 end
-
+# }}}
+
+#Model structure
 mutable struct model
         mesh::AbstractMesh
@@ -200 +223 @@
 
 end# }}}
+
+