Commit 1f28f4d5 authored by mozul's avatar mozul
Browse files

Squashed 'examples/' changes from b82f1bc..53263b1

53263b1 Merge branch 'for_dummies' into 'master'
d183718 [NAMING] in mecaMAILx_RIGID_3D only command.py file with "for_dummies" commands
3d323d9 [NAMING] in mecaMAILx_RIGID_2D only command.py file with "for_dummies" commands
cfd31fb [NAMING] missed to switch to "for_dummies" in two examples of mecaMAILx_3D
665ba7f [FIX] missing POSTPRO.DAT in gen_sample
cd4f5d8 [FIX] typo in gen_sample
5814138 [FIX] missing POSTPRO.DAT or VlocRloc.INI files in some mecaMAILx_3D examples
0d24450 [FIX] missing VlocRloc.INI file in some mecaMAILx_2D examples
42b0ebf [NAMING] in mcaMAILx_3D only command.py file with "for_dummies" commands
f4bee99 [FIX] WriteDisplayFiles call in dilatation/_umat examples
405a013 [NAMING] in mcaMAILx_2D only command.py file with "for_dummies" commands
eca3adf [FIX] missing numpy import in 2_PR_TH_CZM
cfc3430 [FIX] several minor errors when changing scripts in "for_dummies" format
537ede0 [FIX] missing postpro in gen_samples of POLYF examples
7431bad [FIX] missing chipy. in 2_PR_TH_CZM and donut_skin examples
58df807 [FIX] missing postpro file in arche_plein_ceintre_3D
10ce891 [FIX] missing numpy module in POLYG_Vther
49fd7f9 [NAMING] in RIGID_3D only command.py file with "for_dummies" commands
c69ca53 [FIX] add missing postpro files in POLYG_Vther
4746f2b [NAMING] in RIGID_2D only command.py file with "for_dummies" commands
c11e51b notebook maillage
4eae20a Merge branch 'default_sdl' into 'master'
5ecefc4 [FIX] use of Stored_Delassus_Loop contact solver in every example

git-subtree-dir: examples
git-subtree-split: 53263b146be8dc255ca92f6efbc6986ddea769b5
parent 555ea7cd
...@@ -32,7 +32,7 @@ freq_postpro = 1 ...@@ -32,7 +32,7 @@ freq_postpro = 1
# Pilotage du Gauss-Seisel # Pilotage du Gauss-Seisel
# 123456789012345678901234567890 # 123456789012345678901234567890
type = 'Exchange_Local_Global ' type = 'Stored_Delassus_Loop '
#type = 'Exchange_Local_Global ' #type = 'Exchange_Local_Global '
tol = 1.e-4 tol = 1.e-4
relax = 1.0 relax = 1.0
......
...@@ -28,7 +28,7 @@ freq_detect = 10 ...@@ -28,7 +28,7 @@ freq_detect = 10
nlgs_SetWithQuickScramble() nlgs_SetWithQuickScramble()
# 123456789012345678901234567890 # 123456789012345678901234567890
type = 'Exchange_Local_Global ' type = 'Stored_Delassus_Loop '
norm = 'QM/16' norm = 'QM/16'
tol = 1.e-4 tol = 1.e-4
relax = 1.0 relax = 1.0
......
...@@ -34,7 +34,7 @@ freq_postpro = 1 ...@@ -34,7 +34,7 @@ freq_postpro = 1
# Pilotage du Gauss-Seisel # Pilotage du Gauss-Seisel
# 123456789012345678901234567890 # 123456789012345678901234567890
#type = 'Exchange_Local_Global ' #type = 'Exchange_Local_Global '
type = 'Exchange_Local_Global ' type = 'Stored_Delassus_Loop '
tol = 1.e-4 tol = 1.e-4
relax = 1.0 relax = 1.0
quad = 'Quad ' quad = 'Quad '
......
...@@ -30,7 +30,7 @@ nlgs_SetWithQuickScramble() ...@@ -30,7 +30,7 @@ nlgs_SetWithQuickScramble()
# Pilotage du Gauss-Seisel # Pilotage du Gauss-Seisel
# 123456789012345678901234567890 # 123456789012345678901234567890
#type = 'Exchange_Local_Global ' #type = 'Exchange_Local_Global '
type = 'Exchange_Local_Global ' type = 'Stored_Delassus_Loop '
tol = 1.e-4 tol = 1.e-4
relax = 1.0 relax = 1.0
norm = 'Quad ' norm = 'Quad '
......
...@@ -33,7 +33,7 @@ freq_postpro = 1 ...@@ -33,7 +33,7 @@ freq_postpro = 1
# Pilotage du Gauss-Seisel # Pilotage du Gauss-Seisel
# 123456789012345678901234567890 # 123456789012345678901234567890
type = 'Exchange_Local_Global ' type = 'Stored_Delassus_Loop '
#type = 'Exchange_Local_Global ' #type = 'Exchange_Local_Global '
tol = 1.e-4 tol = 1.e-4
relax = 1.0 relax = 1.0
......
...@@ -31,7 +31,7 @@ freq_display = 50 ...@@ -31,7 +31,7 @@ freq_display = 50
freq_write = 50 freq_write = 50
# 123456789012345678901234567890 # 123456789012345678901234567890
# * nlgs solver parameters # * nlgs solver parameters
type = 'Exchange_Local_Global ' type = 'Stored_Delassus_Loop '
norm = 'QM/16' norm = 'QM/16'
tol = 0.1666e-3 tol = 0.1666e-3
relax = 1.0 relax = 1.0
......
...@@ -22,7 +22,7 @@ ref_radius = 5.e-2 ...@@ -22,7 +22,7 @@ ref_radius = 5.e-2
freq_detect = 1 freq_detect = 1
# 123456789012345678901234567890 # 123456789012345678901234567890
type = 'Exchange_Local_Global ' type = 'Stored_Delassus_Loop '
#type = 'Exchange_Local_Global ' #type = 'Exchange_Local_Global '
quad = 'QM/16' quad = 'QM/16'
tol = 0.1666e-3 tol = 0.1666e-3
......
...@@ -28,7 +28,7 @@ ref_radius = 5.e-2 ...@@ -28,7 +28,7 @@ ref_radius = 5.e-2
freq_detect = 1 freq_detect = 1
# 123456789012345678901234567890 # 123456789012345678901234567890
type = 'Exchange_Local_Global ' type = 'Stored_Delassus_Loop '
#type = 'Exchange_Local_Global ' #type = 'Exchange_Local_Global '
quad = 'QM/16' quad = 'QM/16'
tol = 0.1666e-3 tol = 0.1666e-3
......
...@@ -20,7 +20,7 @@ freq_write = 5 ...@@ -20,7 +20,7 @@ freq_write = 5
freq_detect = 1 freq_detect = 1
# 123456789012345678901234567890 # 123456789012345678901234567890
type = 'Exchange_Local_Global ' type = 'Stored_Delassus_Loop '
norm = 'Quad ' norm = 'Quad '
tol = 0.1666E-05 tol = 0.1666E-05
relax = 0.1 relax = 0.1
......
...@@ -19,7 +19,7 @@ ref_radius = 5.e-2 ...@@ -19,7 +19,7 @@ ref_radius = 5.e-2
freq_detect = 1 freq_detect = 1
# 123456789012345678901234567890 # 123456789012345678901234567890
type = 'Exchange_Local_Global ' type = 'Stored_Delassus_Loop '
#type = 'Exchange_Local_Global ' #type = 'Exchange_Local_Global '
quad = 'QM/16' quad = 'QM/16'
tol = 0.1666e-5 tol = 0.1666e-5
......
...@@ -20,7 +20,7 @@ ref_radius = 5.e-2 ...@@ -20,7 +20,7 @@ ref_radius = 5.e-2
freq_detect = 1 freq_detect = 1
# 123456789012345678901234567890 # 123456789012345678901234567890
type = 'Exchange_Local_Global ' type = 'Stored_Delassus_Loop '
#type = 'Exchange_Local_Global ' #type = 'Exchange_Local_Global '
quad = 'QM/16' quad = 'QM/16'
tol = 0.1666e-5 tol = 0.1666e-5
......
...@@ -25,7 +25,7 @@ ref_radius = 0.1e-2 ...@@ -25,7 +25,7 @@ ref_radius = 0.1e-2
freq_detect = 1 freq_detect = 1
# 123456789012345678901234567890 # 123456789012345678901234567890
type = 'Exchange_Local_Global ' type = 'Stored_Delassus_Loop '
norm = 'Quad ' norm = 'Quad '
tol = 0.1666e-3 tol = 0.1666e-3
relax = 1.0 relax = 1.0
......
...@@ -27,7 +27,7 @@ liste_inters=['DKDKx','DKJCx'] ...@@ -27,7 +27,7 @@ liste_inters=['DKDKx','DKJCx']
freq_detect = 1 freq_detect = 1
# 123456789012345678901234567890 # 123456789012345678901234567890
type = 'Exchange_Local_Global ' type = 'Stored_Delassus_Loop '
norm = 'Quad ' norm = 'Quad '
tol = 0.1666e-3 tol = 0.1666e-3
relax = 1.0 relax = 1.0
......
...@@ -18,7 +18,7 @@ liste_tactors=['DISKx','JONCx'] ...@@ -18,7 +18,7 @@ liste_tactors=['DISKx','JONCx']
liste_inters=['DKDKx','DKJCx'] liste_inters=['DKDKx','DKJCx']
freq_detect=1 freq_detect=1
type = 'Exchange_Local_Global ' type = 'Stored_Delassus_Loop '
quad = 'Quad ' quad = 'Quad '
tol = 1.666e-5 tol = 1.666e-5
relax = 1. relax = 1.
...@@ -111,7 +111,7 @@ for k in xrange(1,nb_steps_meca+1,1): ...@@ -111,7 +111,7 @@ for k in xrange(1,nb_steps_meca+1,1):
utilities_logMes('CONTACT RESOLUTION') utilities_logMes('CONTACT RESOLUTION')
DKDKx_RecupRloc() DKDKx_RecupRloc()
DKJCx_RecupRloc() DKJCx_RecupRloc()
nlgs_ExSolver('Exchange_Local_Global ',quad,tol,relax,it1,it2) nlgs_ExSolver(type,quad,tol,relax,it1,it2)
DKDKx_StockRloc() DKDKx_StockRloc()
DKJCx_StockRloc() DKJCx_StockRloc()
......
...@@ -18,7 +18,7 @@ liste_tactors=['DISKx','JONCx'] ...@@ -18,7 +18,7 @@ liste_tactors=['DISKx','JONCx']
liste_inters=['DKDKx','DKJCx'] liste_inters=['DKDKx','DKJCx']
freq_detect=1 freq_detect=1
type = 'Exchange_Local_Global ' type = 'Stored_Delassus_Loop '
quad = 'Quad ' quad = 'Quad '
tol = 1.666e-5 tol = 1.666e-5
relax = 1. relax = 1.
...@@ -112,7 +112,7 @@ for k in xrange(1,nb_steps_meca+1,1): ...@@ -112,7 +112,7 @@ for k in xrange(1,nb_steps_meca+1,1):
utilities_logMes('CONTACT RESOLUTION') utilities_logMes('CONTACT RESOLUTION')
DKDKx_RecupRloc() DKDKx_RecupRloc()
DKJCx_RecupRloc() DKJCx_RecupRloc()
nlgs_ExSolver('Exchange_Local_Global ',quad,tol,relax,it1,it2) nlgs_ExSolver(type,quad,tol,relax,it1,it2)
DKDKx_StockRloc() DKDKx_StockRloc()
DKJCx_StockRloc() DKJCx_StockRloc()
......
...@@ -99,7 +99,7 @@ for k in xrange(1,nb_steps_meca+1,1): ...@@ -99,7 +99,7 @@ for k in xrange(1,nb_steps_meca+1,1):
utilities_logMes('CONTACT RESOLUTION') utilities_logMes('CONTACT RESOLUTION')
DKDKx_RecupRloc() DKDKx_RecupRloc()
DKJCx_RecupRloc() DKJCx_RecupRloc()
nlgs_ExSolver('Exchange_Local_Global ',quad,tol,relax,it1,it2) nlgs_ExSolver('Stored_Delassus_Loop ',quad,tol,relax,it1,it2)
DKDKx_StockRloc() DKDKx_StockRloc()
DKJCx_StockRloc() DKJCx_StockRloc()
......
...@@ -22,7 +22,7 @@ freq_display = 50 ...@@ -22,7 +22,7 @@ freq_display = 50
freq_detect = 1 freq_detect = 1
# 123456789012345678901234567890 # 123456789012345678901234567890
type = 'Exchange_Local_Global ' type = 'Stored_Delassus_Loop '
norm = 'Quad ' norm = 'Quad '
tol = 0.1666e-3 tol = 0.1666e-3
relax = 1.0 relax = 1.0
......
...@@ -100,7 +100,7 @@ for k in xrange(1,nb_steps+1,1): ...@@ -100,7 +100,7 @@ for k in xrange(1,nb_steps+1,1):
# #
DKJCx_RecupRloc() DKJCx_RecupRloc()
DKDKx_RecupRloc() DKDKx_RecupRloc()
nlgs_ExSolver('Exchange_Local_Global ',quad, tol, relax, gs_it1, gs_it2) nlgs_ExSolver('Stored_Delassus_Loop ',quad, tol, relax, gs_it1, gs_it2)
DKJCx_StockRloc() DKJCx_StockRloc()
DKDKx_StockRloc() DKDKx_StockRloc()
# #
......
...@@ -22,7 +22,7 @@ relax = 1.0 ...@@ -22,7 +22,7 @@ relax = 1.0
norm = 'QM/16' norm = 'QM/16'
gs_it1 = 100 gs_it1 = 100
gs_it2 = 200 gs_it2 = 200
gs_type ='Exchange_Local_Global ' gs_type ='Stored_Delassus_Loop '
print 'INIT TIME STEPPING' print 'INIT TIME STEPPING'
......
...@@ -94,7 +94,7 @@ for k in xrange(1,10,1): ...@@ -94,7 +94,7 @@ for k in xrange(1,10,1):
DKJCx_RecupRloc() DKJCx_RecupRloc()
DKDKx_RecupRloc() DKDKx_RecupRloc()
timer_StartTimer(id_contact_solve) timer_StartTimer(id_contact_solve)
nlgs_ExSolver('Exchange_Local_Global ',quad, tol, relax, gs_it1, gs_it2) nlgs_ExSolver('Stored_Delassus_Loop ',quad, tol, relax, gs_it1, gs_it2)
timer_StopTimer(id_contact_solve) timer_StopTimer(id_contact_solve)
DKJCx_StockRloc() DKJCx_StockRloc()
DKDKx_StockRloc() DKDKx_StockRloc()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment