Commit d24baec6 authored by mozul's avatar mozul
Browse files

Merge commit '1f28f4d5'

Getting last examples for CMU course
parents 98dd03ac 1f28f4d5
......@@ -32,7 +32,7 @@ freq_postpro = 1
# Pilotage du Gauss-Seisel
# 123456789012345678901234567890
type = 'Exchange_Local_Global '
type = 'Stored_Delassus_Loop '
#type = 'Exchange_Local_Global '
tol = 1.e-4
relax = 1.0
......
......@@ -28,7 +28,7 @@ freq_detect = 10
nlgs_SetWithQuickScramble()
# 123456789012345678901234567890
type = 'Exchange_Local_Global '
type = 'Stored_Delassus_Loop '
norm = 'QM/16'
tol = 1.e-4
relax = 1.0
......
......@@ -34,7 +34,7 @@ freq_postpro = 1
# Pilotage du Gauss-Seisel
# 123456789012345678901234567890
#type = 'Exchange_Local_Global '
type = 'Exchange_Local_Global '
type = 'Stored_Delassus_Loop '
tol = 1.e-4
relax = 1.0
quad = 'Quad '
......
......@@ -30,7 +30,7 @@ nlgs_SetWithQuickScramble()
# Pilotage du Gauss-Seisel
# 123456789012345678901234567890
#type = 'Exchange_Local_Global '
type = 'Exchange_Local_Global '
type = 'Stored_Delassus_Loop '
tol = 1.e-4
relax = 1.0
norm = 'Quad '
......
......@@ -33,7 +33,7 @@ freq_postpro = 1
# Pilotage du Gauss-Seisel
# 123456789012345678901234567890
type = 'Exchange_Local_Global '
type = 'Stored_Delassus_Loop '
#type = 'Exchange_Local_Global '
tol = 1.e-4
relax = 1.0
......
......@@ -31,7 +31,7 @@ freq_display = 50
freq_write = 50
# 123456789012345678901234567890
# * nlgs solver parameters
type = 'Exchange_Local_Global '
type = 'Stored_Delassus_Loop '
norm = 'QM/16'
tol = 0.1666e-3
relax = 1.0
......
......@@ -22,7 +22,7 @@ ref_radius = 5.e-2
freq_detect = 1
# 123456789012345678901234567890
type = 'Exchange_Local_Global '
type = 'Stored_Delassus_Loop '
#type = 'Exchange_Local_Global '
quad = 'QM/16'
tol = 0.1666e-3
......
......@@ -28,7 +28,7 @@ ref_radius = 5.e-2
freq_detect = 1
# 123456789012345678901234567890
type = 'Exchange_Local_Global '
type = 'Stored_Delassus_Loop '
#type = 'Exchange_Local_Global '
quad = 'QM/16'
tol = 0.1666e-3
......
......@@ -20,7 +20,7 @@ freq_write = 5
freq_detect = 1
# 123456789012345678901234567890
type = 'Exchange_Local_Global '
type = 'Stored_Delassus_Loop '
norm = 'Quad '
tol = 0.1666E-05
relax = 0.1
......
......@@ -19,7 +19,7 @@ ref_radius = 5.e-2
freq_detect = 1
# 123456789012345678901234567890
type = 'Exchange_Local_Global '
type = 'Stored_Delassus_Loop '
#type = 'Exchange_Local_Global '
quad = 'QM/16'
tol = 0.1666e-5
......
......@@ -20,7 +20,7 @@ ref_radius = 5.e-2
freq_detect = 1
# 123456789012345678901234567890
type = 'Exchange_Local_Global '
type = 'Stored_Delassus_Loop '
#type = 'Exchange_Local_Global '
quad = 'QM/16'
tol = 0.1666e-5
......
......@@ -25,7 +25,7 @@ ref_radius = 0.1e-2
freq_detect = 1
# 123456789012345678901234567890
type = 'Exchange_Local_Global '
type = 'Stored_Delassus_Loop '
norm = 'Quad '
tol = 0.1666e-3
relax = 1.0
......
......@@ -27,7 +27,7 @@ liste_inters=['DKDKx','DKJCx']
freq_detect = 1
# 123456789012345678901234567890
type = 'Exchange_Local_Global '
type = 'Stored_Delassus_Loop '
norm = 'Quad '
tol = 0.1666e-3
relax = 1.0
......
......@@ -18,7 +18,7 @@ liste_tactors=['DISKx','JONCx']
liste_inters=['DKDKx','DKJCx']
freq_detect=1
type = 'Exchange_Local_Global '
type = 'Stored_Delassus_Loop '
quad = 'Quad '
tol = 1.666e-5
relax = 1.
......@@ -111,7 +111,7 @@ for k in xrange(1,nb_steps_meca+1,1):
utilities_logMes('CONTACT RESOLUTION')
DKDKx_RecupRloc()
DKJCx_RecupRloc()
nlgs_ExSolver('Exchange_Local_Global ',quad,tol,relax,it1,it2)
nlgs_ExSolver(type,quad,tol,relax,it1,it2)
DKDKx_StockRloc()
DKJCx_StockRloc()
......
......@@ -18,7 +18,7 @@ liste_tactors=['DISKx','JONCx']
liste_inters=['DKDKx','DKJCx']
freq_detect=1
type = 'Exchange_Local_Global '
type = 'Stored_Delassus_Loop '
quad = 'Quad '
tol = 1.666e-5
relax = 1.
......@@ -112,7 +112,7 @@ for k in xrange(1,nb_steps_meca+1,1):
utilities_logMes('CONTACT RESOLUTION')
DKDKx_RecupRloc()
DKJCx_RecupRloc()
nlgs_ExSolver('Exchange_Local_Global ',quad,tol,relax,it1,it2)
nlgs_ExSolver(type,quad,tol,relax,it1,it2)
DKDKx_StockRloc()
DKJCx_StockRloc()
......
......@@ -99,7 +99,7 @@ for k in xrange(1,nb_steps_meca+1,1):
utilities_logMes('CONTACT RESOLUTION')
DKDKx_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()
DKJCx_StockRloc()
......
......@@ -22,7 +22,7 @@ freq_display = 50
freq_detect = 1
# 123456789012345678901234567890
type = 'Exchange_Local_Global '
type = 'Stored_Delassus_Loop '
norm = 'Quad '
tol = 0.1666e-3
relax = 1.0
......
......@@ -100,7 +100,7 @@ for k in xrange(1,nb_steps+1,1):
#
DKJCx_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()
DKDKx_StockRloc()
#
......
......@@ -22,7 +22,7 @@ relax = 1.0
norm = 'QM/16'
gs_it1 = 100
gs_it2 = 200
gs_type ='Exchange_Local_Global '
gs_type ='Stored_Delassus_Loop '
print 'INIT TIME STEPPING'
......
......@@ -94,7 +94,7 @@ for k in xrange(1,10,1):
DKJCx_RecupRloc()
DKDKx_RecupRloc()
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)
DKJCx_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