Skip to content

Commit

Permalink
small bugs fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@dangla
dangla committed Jan 24, 2024
1 parent 851a005 commit c27095d
Show file tree
Hide file tree
Showing 39 changed files with 13,194 additions and 6,752 deletions.
18 changes: 9 additions & 9 deletions CHANGELOG
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
News in 2.9: A new algorithm is implemented in the module SNIA which
is based on a sequential non iterative approach (SNIA). The build system is
switched to CMake. Bugs fixed in MA38 solver. New way of using extra libraries.
The number of temporal discrete solutions kept in memory for possible use
in time discretization schemes can be given in the command line. The solver
KSP from the Petsc library can be selected if the external library "libpetsc.so"
was installed (see EXTRALIBS).

News in 2.8: Re-arranging some allocation of memory space for the mesh.
News in 2.8: Parallelization via OpemMP and MPI.
A new algorithm is implemented in the module SNIA which is based on a
sequential non iterative approach (SNIA). The build system is switched
to CMake. Bugs fixed in MA38 solver. New way of using extra libraries.
The number of temporal discrete solutions kept in memory for possible use
in time discretization schemes can be given in the command line.
The solver KSP from the Petsc library can be selected if the external
library "libpetsc.so" was installed (see EXTRALIBS).
Re-arranging some allocation of memory space for the mesh.
Reformulation of the jacobian matrix of the transformation between the
element in the reference frame and that in the current frame. Zero-thickness
element can be dealt with. Unknowns like pressure/temperature or other can be
Expand Down
3 changes: 3 additions & 0 deletions TODO
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Request(01/09/2023) - MPI parallelization.
Done(07/01/2024)

Request(21/10/2022) - Rename all files using the prefix "bil_".
To avoid confusion rename also "Bil.[c,h]" as "Entry.[c,h]"

Expand Down
4 changes: 3 additions & 1 deletion base/BBM/BBM
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Geometry # dimension (1, 2, 3) et symétrie (axis, plan) du pb
Mesh # maillage considéré (généré avec GMSH)
carre.msh


Material # liste des matériaux (modèles et param. associés)
Model = BBM # nom du modèle
gravity = 0 # gravité
Expand All @@ -24,7 +25,8 @@ k_int = 1e-20 # permeabilite intrinseque
mu_l = 0.001 # viscosite du liquide
suction_cohesion_coefficient = 0.8
#Curves = wrc # nom du fichier contenant p_c S_l k_rl LC
Curves = wrc2 pc = Range{x1 = 0 , x2 = 30.e6, n = 171} sl = Expressions(1){p0 = 1.e6 ; m = 0.6 ; sl = (1 + (pc/p0)**(1/(1-m)))**(-m)} kl = Expressions(1){kl = 1} kg = Expressions(1){kg = 1}
Curves = wrc2 pc = Range{x1 = 0 , x2 = 30.e6, n = 171} sl = Expressions(1){p0 = 1.e6 ; m = 0.6 ; sl = (1 + (pc/p0)**(1/(1-m)))**(-m)}
Curves = krc2 pc = Range{x1 = 0 , x2 = 30.e6, n = 171} kl = Expressions(1){kl = 1} kg = Expressions(1){kg = 1}
Curves = lc pc = Range{x1 = 0 , x2 = 1.e6, n = 200} lc = Expressions(1){l0 = 0.065 ; k = 0.011 ; beta = 20.e-6 ; r = 0.75 ; lc = (l0 - k)/(l0*((1-r)*exp(-beta*pc) + r) - k)}


Expand Down
2 changes: 1 addition & 1 deletion base/BBM/BBM.gp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Y(p,pc) = (p <= pc) ? m*sqrt(abs((p + ps)*(p - pc))) : 1/0


# Input Data file
file = 'toto'
file = 'BBM'

# Data files
file1 = file.'.p1'
Expand Down
12,374 changes: 6,181 additions & 6,193 deletions base/BBM/BBM.p1
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions base/BBM/BBM.t0
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Version 2.8.8, Tue Feb 28 11:08:50 2023
# Version 2.9.1, Tue Jan 16 11:27:34 2024
# Time = 0.000000e+00
# Model = BBM
# Number of views = 8
# Numbers of components per view = 1 3 3 9 1 1 9 1
# Coordinates(1) Liquid pore pressure(4) Displacements(5) Fluid mass flow(8) Stresses(11) Saturation degree(20) Void ratio variation(21) Plastic strains(22) Hardening variable(31)
# Coordinates(1) Liquid_pore_pressure(4) Displacements(5) Fluid_mass_flow(8) Stresses(11) Saturation_degree(20) Void_ratio_variation(21) Plastic_strains(22) Hardening_variable(31)
0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 1.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 1.059663e+01
1.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 1.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 1.059663e+01
1.000000e+00 1.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 1.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 1.059663e+01
Expand Down
12 changes: 6 additions & 6 deletions base/BBM/BBM.t1
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Version 2.8.8, Tue Feb 28 11:08:51 2023
# Version 2.9.1, Tue Jan 16 11:27:34 2024
# Time = 1.000000e+00
# Model = BBM
# Number of views = 8
# Numbers of components per view = 1 3 3 9 1 1 9 1
# Coordinates(1) Liquid pore pressure(4) Displacements(5) Fluid mass flow(8) Stresses(11) Saturation degree(20) Void ratio variation(21) Plastic strains(22) Hardening variable(31)
0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 3.856117e-10 0.000000e+00 3.856117e-10 -4.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 1.000000e+00 -4.057767e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 1.059663e+01
1.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -1.014442e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 3.856117e-10 0.000000e+00 3.856117e-10 -4.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 1.000000e+00 -4.057767e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 1.059663e+01
1.000000e+00 1.000000e+00 0.000000e+00 0.000000e+00 -1.014442e-02 -1.014442e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 3.856117e-10 0.000000e+00 3.856117e-10 -4.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 1.000000e+00 -4.057767e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 1.059663e+01
0.000000e+00 1.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -1.014442e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 3.856117e-10 0.000000e+00 3.856117e-10 -4.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 1.000000e+00 -4.057767e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 1.059663e+01
# Coordinates(1) Liquid_pore_pressure(4) Displacements(5) Fluid_mass_flow(8) Stresses(11) Saturation_degree(20) Void_ratio_variation(21) Plastic_strains(22) Hardening_variable(31)
0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 3.445307e-10 0.000000e+00 3.445307e-10 -4.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 1.000000e+00 -4.077965e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 1.059663e+01
1.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -1.019491e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 3.445307e-10 0.000000e+00 3.445307e-10 -4.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 1.000000e+00 -4.077965e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 1.059663e+01
1.000000e+00 1.000000e+00 0.000000e+00 0.000000e+00 -1.019491e-02 -1.019491e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 3.445307e-10 0.000000e+00 3.445307e-10 -4.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 1.000000e+00 -4.077965e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 1.059663e+01
0.000000e+00 1.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -1.019491e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 3.445307e-10 0.000000e+00 3.445307e-10 -4.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 1.000000e+00 -4.077965e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 1.059663e+01
12 changes: 6 additions & 6 deletions base/BBM/BBM.t2
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Version 2.8.8, Tue Feb 28 11:08:51 2023
# Version 2.9.1, Tue Jan 16 11:27:34 2024
# Time = 2.000000e+00
# Model = BBM
# Number of views = 8
# Numbers of components per view = 1 3 3 9 1 1 9 1
# Coordinates(1) Liquid pore pressure(4) Displacements(5) Fluid mass flow(8) Stresses(11) Saturation degree(20) Void ratio variation(21) Plastic strains(22) Hardening variable(31)
0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 1.862202e-10 0.000000e+00 1.862202e-10 -1.000000e+03 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 9.982392e-01 -1.663633e-03 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 1.059663e+01
1.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 -4.159082e-04 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 1.862202e-10 0.000000e+00 1.862202e-10 -1.000000e+03 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 9.982392e-01 -1.663633e-03 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 1.059663e+01
1.000000e+00 1.000000e+00 0.000000e+00 -4.000000e+04 -4.159082e-04 -4.159082e-04 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 1.862202e-10 0.000000e+00 1.862202e-10 -1.000000e+03 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 9.982392e-01 -1.663633e-03 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 1.059663e+01
0.000000e+00 1.000000e+00 0.000000e+00 -4.000000e+04 0.000000e+00 -4.159082e-04 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 1.862202e-10 0.000000e+00 1.862202e-10 -1.000000e+03 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 9.982392e-01 -1.663633e-03 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 1.059663e+01
# Coordinates(1) Liquid_pore_pressure(4) Displacements(5) Fluid_mass_flow(8) Stresses(11) Saturation_degree(20) Void_ratio_variation(21) Plastic_strains(22) Hardening_variable(31)
0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 9.398254e-10 0.000000e+00 9.398254e-10 -1.000000e+03 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 9.982392e-01 -2.066940e-03 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 1.059663e+01
1.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 -5.167350e-04 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 9.398254e-10 0.000000e+00 9.398254e-10 -1.000000e+03 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 9.982392e-01 -2.066940e-03 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 1.059663e+01
1.000000e+00 1.000000e+00 0.000000e+00 -4.000000e+04 -5.167350e-04 -5.167350e-04 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 9.398254e-10 0.000000e+00 9.398254e-10 -1.000000e+03 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 9.982392e-01 -2.066940e-03 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 1.059663e+01
0.000000e+00 1.000000e+00 0.000000e+00 -4.000000e+04 0.000000e+00 -5.167350e-04 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 9.398254e-10 0.000000e+00 9.398254e-10 -1.000000e+03 0.000000e+00 0.000000e+00 0.000000e+00 -1.000000e+03 9.982392e-01 -2.066940e-03 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 1.059663e+01
12 changes: 6 additions & 6 deletions base/BBM/BBM.t3
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Version 2.8.8, Tue Feb 28 11:08:51 2023
# Version 2.9.1, Tue Jan 16 11:27:35 2024
# Time = 3.000000e+00
# Model = BBM
# Number of views = 8
# Numbers of components per view = 1 3 3 9 1 1 9 1
# Coordinates(1) Liquid pore pressure(4) Displacements(5) Fluid mass flow(8) Stresses(11) Saturation degree(20) Void ratio variation(21) Plastic strains(22) Hardening variable(31)
0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -8.000000e+04 3.971305e-11 0.000000e+00 3.971305e-11 -8.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 -8.000000e+04 9.982392e-01 -7.488144e-02 -6.274746e-03 1.159489e-17 0.000000e+00 1.159489e-17 -6.274746e-03 0.000000e+00 0.000000e+00 0.000000e+00 -6.274746e-03 1.094523e+01
1.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 -1.872036e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -8.000000e+04 3.971305e-11 0.000000e+00 3.971305e-11 -8.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 -8.000000e+04 9.982392e-01 -7.488144e-02 -6.274746e-03 1.159489e-17 0.000000e+00 1.159489e-17 -6.274746e-03 0.000000e+00 0.000000e+00 0.000000e+00 -6.274746e-03 1.094523e+01
1.000000e+00 1.000000e+00 0.000000e+00 -4.000000e+04 -1.872036e-02 -1.872036e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -8.000000e+04 3.971305e-11 0.000000e+00 3.971305e-11 -8.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 -8.000000e+04 9.982392e-01 -7.488144e-02 -6.274746e-03 1.159489e-17 0.000000e+00 1.159489e-17 -6.274746e-03 0.000000e+00 0.000000e+00 0.000000e+00 -6.274746e-03 1.094523e+01
0.000000e+00 1.000000e+00 0.000000e+00 -4.000000e+04 0.000000e+00 -1.872036e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -8.000000e+04 3.971305e-11 0.000000e+00 3.971305e-11 -8.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 -8.000000e+04 9.982392e-01 -7.488144e-02 -6.274746e-03 1.159489e-17 0.000000e+00 1.159489e-17 -6.274746e-03 0.000000e+00 0.000000e+00 0.000000e+00 -6.274746e-03 1.094523e+01
# Coordinates(1) Liquid_pore_pressure(4) Displacements(5) Fluid_mass_flow(8) Stresses(11) Saturation_degree(20) Void_ratio_variation(21) Plastic_strains(22) Hardening_variable(31)
0.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -8.000000e+04 5.281146e-12 0.000000e+00 5.281146e-12 -8.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 -8.000000e+04 9.982392e-01 -6.943246e-02 -4.706059e-03 3.303916e-18 0.000000e+00 3.303916e-18 -4.706059e-03 0.000000e+00 0.000000e+00 0.000000e+00 -4.706059e-03 1.094523e+01
1.000000e+00 0.000000e+00 0.000000e+00 -4.000000e+04 -1.735812e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -8.000000e+04 5.281146e-12 0.000000e+00 5.281146e-12 -8.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 -8.000000e+04 9.982392e-01 -6.943246e-02 -4.706059e-03 3.303916e-18 0.000000e+00 3.303916e-18 -4.706059e-03 0.000000e+00 0.000000e+00 0.000000e+00 -4.706059e-03 1.094523e+01
1.000000e+00 1.000000e+00 0.000000e+00 -4.000000e+04 -1.735812e-02 -1.735812e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -8.000000e+04 5.281146e-12 0.000000e+00 5.281146e-12 -8.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 -8.000000e+04 9.982392e-01 -6.943246e-02 -4.706059e-03 3.303916e-18 0.000000e+00 3.303916e-18 -4.706059e-03 0.000000e+00 0.000000e+00 0.000000e+00 -4.706059e-03 1.094523e+01
0.000000e+00 1.000000e+00 0.000000e+00 -4.000000e+04 0.000000e+00 -1.735812e-02 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -8.000000e+04 5.281146e-12 0.000000e+00 5.281146e-12 -8.000000e+04 0.000000e+00 0.000000e+00 0.000000e+00 -8.000000e+04 9.982392e-01 -6.943246e-02 -4.706059e-03 3.303916e-18 0.000000e+00 3.303916e-18 -4.706059e-03 0.000000e+00 0.000000e+00 0.000000e+00 -4.706059e-03 1.094523e+01
Loading

0 comments on commit c27095d

Please sign in to comment.