Commit 0c46e8a9 authored by mozul's avatar mozul

Merge commit 'e8fedc29'

2016 release candidate 5
parents 43fe7961 e8fedc29
......@@ -32,7 +32,7 @@ freq_postpro = 1
# Pilotage du Gauss-Seisel
# 123456789012345678901234567890
type = 'Stored_Delassus_Loops '
type = 'Exchange_Local_Global '
#type = 'Exchange_Local_Global '
tol = 1.e-4
relax = 1.0
......
......@@ -28,7 +28,7 @@ freq_detect = 10
nlgs_SetWithQuickScramble()
# 123456789012345678901234567890
type = 'Stored_Delassus_Loops '
type = 'Exchange_Local_Global '
norm = 'QM/16'
tol = 1.e-4
relax = 1.0
......
......@@ -33,7 +33,7 @@ freq_postpro = 1
# Pilotage du Gauss-Seisel
# 123456789012345678901234567890
#type = 'Stored_Delassus_Loops '
#type = 'Exchange_Local_Global '
type = 'Exchange_Local_Global '
tol = 1.e-4
relax = 1.0
......
......@@ -29,7 +29,7 @@ nlgs_SetWithQuickScramble()
# Pilotage du Gauss-Seisel
# 123456789012345678901234567890
#type = 'Stored_Delassus_Loops '
#type = 'Exchange_Local_Global '
type = 'Exchange_Local_Global '
tol = 1.e-4
relax = 1.0
......
......@@ -33,7 +33,7 @@ freq_postpro = 1
# Pilotage du Gauss-Seisel
# 123456789012345678901234567890
type = 'Stored_Delassus_Loops '
type = 'Exchange_Local_Global '
#type = 'Exchange_Local_Global '
tol = 1.e-4
relax = 1.0
......
......@@ -22,7 +22,7 @@ ref_radius = 5.e-2
freq_detect = 1
# 123456789012345678901234567890
type = 'Stored_Delassus_Loops '
type = 'Exchange_Local_Global '
#type = 'Exchange_Local_Global '
quad = 'QM/16'
tol = 0.1666e-3
......@@ -216,6 +216,8 @@ for k in xrange(1,nstep+1,1):
RBDY3_ComputeDof()
mecaMAILx_ComputeField()
#
utilities_logMes( 'UPDATE DOF, FIELDS')
TimeEvolution_UpdateStep()
......
......@@ -28,7 +28,7 @@ ref_radius = 5.e-2
freq_detect = 1
# 123456789012345678901234567890
type = 'Stored_Delassus_Loops '
type = 'Exchange_Local_Global '
#type = 'Exchange_Local_Global '
quad = 'QM/16'
tol = 0.1666e-3
......@@ -230,6 +230,8 @@ for k in xrange(1,nstep+1,1):
CSPRx_StockRloc()
RBDY3_ComputeDof()
mecaMAILx_ComputeField()
#
utilities_logMes( 'UPDATE DOF, FIELDS')
TimeEvolution_UpdateStep()
......
......@@ -20,7 +20,7 @@ freq_write = 5
freq_detect = 1
# 123456789012345678901234567890
type = 'Stored_Delassus_Loops '
type = 'Exchange_Local_Global '
norm = 'Quad '
tol = 0.1666E-05
relax = 0.1
......@@ -178,6 +178,7 @@ while TimeEvolution_GetTime() < t_final :
### postpro ###
postpro_PostproDuringComputation()
#utilities_logMes('UPDATE DOF')
mecaMAILx_ComputeField()
TimeEvolution_UpdateStep()
mecaMAILx_UpdateDof()
mecaMAILx_UpdateBulk()
......
......@@ -19,7 +19,7 @@ ref_radius = 5.e-2
freq_detect = 1
# 123456789012345678901234567890
type = 'Stored_Delassus_Loops '
type = 'Exchange_Local_Global '
#type = 'Exchange_Local_Global '
quad = 'QM/16'
tol = 0.1666e-5
......@@ -279,6 +279,7 @@ for k in xrange(1,nstep+1,1):
#
utilities_logMes('UPDATE DOF, FIELDS')
mecaMAILx_ComputeField()
TimeEvolution_UpdateStep()
mecaMAILx_UpdateDof()
mecaMAILx_UpdateBulk()
......
......@@ -20,7 +20,7 @@ ref_radius = 5.e-2
freq_detect = 1
# 123456789012345678901234567890
type = 'Stored_Delassus_Loops '
type = 'Exchange_Local_Global '
#type = 'Exchange_Local_Global '
quad = 'QM/16'
tol = 0.1666e-5
......@@ -238,6 +238,7 @@ for k in xrange(1,nstep+1,1):
#
utilities_logMes('COMPUTE DOF, FIELDS, etc.')
mecaMAILx_ComputeDof()
mecaMAILx_ComputeField()
RBDY3_ComputeDof()
utilities_logMes('UPDATE DOF, FIELDS')
......
......@@ -152,6 +152,8 @@ while TimeEvolution_GetTime() < t_final :
if not istate == 1 :
mecaMAILx_ComputeField()
#utilities_logMes('UPDATE DOF')
TimeEvolution_UpdateStep()
mecaMAILx_UpdateDof()
......
......@@ -127,6 +127,7 @@ for k in xrange(1,nstep+1,1):
utilities_logMes('COMPUTE DOF, FIELDS, etc.')
mecaMAILx_ComputeDof()
mecaMAILx_ComputeField()
utilities_logMes('UPDATE DOF, FIELDS')
TimeEvolution_UpdateStep()
......
......@@ -126,6 +126,7 @@ for k in xrange(1,nstep+1,1):
utilities_logMes('COMPUTE DOF, FIELDS, etc.')
mecaMAILx_ComputeDof()
mecaMAILx_ComputeField()
utilities_logMes('UPDATE DOF, FIELDS')
TimeEvolution_UpdateStep()
......
......@@ -25,7 +25,7 @@ ref_radius = 0.1e-2
freq_detect = 1
# 123456789012345678901234567890
type = 'Stored_Delassus_Loops '
type = 'Exchange_Local_Global '
norm = 'Quad '
tol = 0.1666e-3
relax = 1.0
......
......@@ -27,7 +27,7 @@ liste_inters=['DKDKx','DKJCx']
freq_detect = 1
# 123456789012345678901234567890
type = 'Stored_Delassus_Loops '
type = 'Exchange_Local_Global '
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 = 'Stored_Delassus_Loops '
type = 'Exchange_Local_Global '
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('Stored_Delassus_Loops ',quad,tol,relax,it1,it2)
nlgs_ExSolver('Exchange_Local_Global ',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 = 'Stored_Delassus_Loops '
type = 'Exchange_Local_Global '
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('Stored_Delassus_Loops ',quad,tol,relax,it1,it2)
nlgs_ExSolver('Exchange_Local_Global ',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('Stored_Delassus_Loops ',quad,tol,relax,it1,it2)
nlgs_ExSolver('Exchange_Local_Global ',quad,tol,relax,it1,it2)
DKDKx_StockRloc()
DKJCx_StockRloc()
......
......@@ -22,7 +22,7 @@ freq_display = 50
freq_detect = 1
# 123456789012345678901234567890
type = 'Stored_Delassus_Loops '
type = 'Exchange_Local_Global '
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('Stored_Delassus_Loops ',quad, tol, relax, gs_it1, gs_it2)
nlgs_ExSolver('Exchange_Local_Global ',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 ='Stored_Delassus_Loops '
gs_type ='Exchange_Local_Global '
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('Stored_Delassus_Loops ',quad, tol, relax, gs_it1, gs_it2)
nlgs_ExSolver('Exchange_Local_Global ',quad, tol, relax, gs_it1, gs_it2)
timer_StopTimer(id_contact_solve)
DKJCx_StockRloc()
DKDKx_StockRloc()
......
......@@ -63,7 +63,7 @@ relax = 1.0
norm = 'Quad '
gs_it1 = 50
gs_it2 = 10
type = 'Stored_Delassus_Loops '
type = 'Exchange_Local_Global '
nlgs_3D_DiagonalResolution()
......
......@@ -31,135 +31,81 @@ gs_it2 = 101
#nlgs_3D_SetWithQuickScramble()
overall_DIME(3,0)
SetDimension(3)
print 'INIT TIME STEPPING'
utilities_logMes('INIT TIME STEPPING')
TimeEvolution_SetTimeStep(dt)
Integrator_InitTheta(theta)
RBDY3_NewRotationScheme()
### model reading ###
print 'READ BODIES'
RBDY3_ReadBodies()
utilities_logMes('READ BODIES')
ReadBodies()
print 'READ BEHAVIOURS'
bulk_behav_ReadBehaviours()
tact_behav_ReadBehaviours()
utilities_logMes('READ BEHAVIOURS')
ReadBehaviours()
#LOADS
RBDY3_LoadBehaviours()
LoadBehaviours()
print 'READ INI DOF'
TimeEvolution_ReadIniDof()
RBDY3_ReadIniDof()
utilities_logMes('READ INI DOF')
ReadIniDof()
PLANx_LoadTactors()
POLYR_LoadTactors()
LoadTactors()
print 'READ INI Vloc Rloc'
TimeEvolution_ReadIniVlocRloc()
PRPLx_ReadIniVlocRloc()
PRPRx_ReadIniVlocRloc()
utilities_logMes('READ INI Vloc Rloc')
ReadIniVlocRloc()
print 'READ DRIVEN DOF'
RBDY3_ReadDrivenDof()
utilities_logMes('READ DRIVEN DOF')
ReadDrivenDof()
overall_WriteBodies()
RBDY3_WriteBodies()
#MAILx_WriteBodies()
bulk_behav_WriteBehaviours()
tact_behav_WriteBehaviours()
TimeEvolution_WriteLastDof()
RBDY3_WriteLastDof()
overall_WriteDrivenDof()
RBDY3_WriteDrivenDof()
utilities_logMes('WRITE BODIES')
WriteBodies()
utilities_logMes('WRITE BEHAVIOURS')
WriteBehaviours()
utilities_logMes('WRITE DRIVEN DOF')
WriteDrivenDof()
### set periodic conditions ###
#RBDY3_SetSourcePointWithIni(2, 5.0, 12.0, 12.0, 4.0)
RBDY3_SetXPeriodicCondition(xperiode)
PRPRx_SetXPeriodicCondition(xperiode)
post3D_SetXPeriodicCondition(xperiode)
RBDY3_SetYPeriodicCondition(yperiode)
PRPRx_SetYPeriodicCondition(yperiode)
post3D_SetYPeriodicCondition(yperiode)
### post3D ##
post3D_SetDisplayedField('POSITION ')
post3D_SetDisplayedField('AVERAGE VELOCITY')
post3D_SetDisplayedField('STRESS ')
post3D_SetDisplayedField('FORCES ')
display_3D_SetDisplayedField('TACTOR')
display_3D_SetDisplayedField('INTERACTION')
post3D_Init()
display_3D_Init(0)
SetPeriodicCondition(xperiode,yperiode)
postpro_3D_PostproBeforeComputation()
OpenDisplayFiles()
OpenPostproFiles()
### compute masses ###
RBDY3_ComputeMass()
ComputeMass()
for k in range(nb_steps):
#
print 'INCREMENT STEP'
TimeEvolution_IncrementStep()
RBDY3_IncrementStep()
IncrementStep()
#
print 'DISPLAY TIMES'
TimeEvolution_DisplayStep()
#
print 'COMPUTE Fext'
RBDY3_ComputeFext()
ComputeFext()
ComputeBulk()
ComputeFreeVelocity()
#
print 'COMPUTE Fint'
RBDY3_ComputeBulk()
#
print 'COMPUTE Free Vlocy'
RBDY3_ComputeFreeVelocity()
#
print 'SELECT PROX TACTORS'
overall_SelectProxTactors(freq_detect)
PRPLx_SelectProxTactors()
PRPRx_SelectProxTactors()
SelectProxTactors(freq_detect)
PRPLx_RecupRloc()
PRPRx_RecupRloc()
nlgs_3D_ExSolver('Exchange_Local_Global ',quad, tol, relax, gs_it1, gs_it2)
PRPLx_StockRloc()
PRPRx_StockRloc()
RecupRloc()
ExSolver('Exchange_Local_Global ',quad, tol, relax, gs_it1, gs_it2)
StockRloc()
#
print 'COMPUTE DOF'
RBDY3_ComputeDof()
#
print 'UPDATE DOF'
TimeEvolution_UpdateStep()
RBDY3_UpdateDof()
ComputeDof()
UpdateStep()
### post3D ###
post3D_Update()
overall_WriteOutDisplayFile(freq_display)
display_3D_WriteOutDisplayFile(0)
WriteLastDof()
WriteLastVlocRloc()
### postpro ###
postpro_3D_PostproDuringComputation()
WriteDisplayFiles(freq_display)
WritePostproFiles()
### writeout handling ###
overall_CleanWriteOutFlags()
#RBDY3_CheckSourcePoint()
TimeEvolution_WriteLastDof()
RBDY3_WriteLastDof()
#
TimeEvolution_WriteLastVlocRloc()
PRPRx_WriteLastVlocRloc()
WriteLastDof()
WriteLastVlocRloc()
postpro_3D_ClosePostproFiles()
CloseDisplayFiles()
ClosePostproFiles()
......@@ -31,135 +31,81 @@ gs_it2 = 101
#nlgs_3D_SetWithQuickScramble()
overall_DIME(3,0)
SetDimension(3)
print 'INIT TIME STEPPING'
utilities_logMes('INIT TIME STEPPING')
TimeEvolution_SetTimeStep(dt)
Integrator_InitTheta(theta)
RBDY3_NewRotationScheme()
### model reading ###
print 'READ BODIES'
RBDY3_ReadBodies()
utilities_logMes('READ BODIES')
ReadBodies()
print 'READ BEHAVIOURS'
bulk_behav_ReadBehaviours()
tact_behav_ReadBehaviours()
utilities_logMes('READ BEHAVIOURS')
ReadBehaviours()
#LOADS
RBDY3_LoadBehaviours()
LoadBehaviours()
print 'READ INI DOF'
TimeEvolution_ReadIniDof()
RBDY3_ReadIniDof()
utilities_logMes('READ INI DOF')
ReadIniDof()
PLANx_LoadTactors()
POLYR_LoadTactors()
LoadTactors()
print 'READ INI Vloc Rloc'
TimeEvolution_ReadIniVlocRloc()
PRPLx_ReadIniVlocRloc()
PRPRx_ReadIniVlocRloc()
utilities_logMes('READ INI Vloc Rloc')
ReadIniVlocRloc()
print 'READ DRIVEN DOF'
RBDY3_ReadDrivenDof()
utilities_logMes('READ DRIVEN DOF')
ReadDrivenDof()
overall_WriteBodies()
RBDY3_WriteBodies()
#MAILx_WriteBodies()
bulk_behav_WriteBehaviours()
tact_behav_WriteBehaviours()
TimeEvolution_WriteLastDof()
RBDY3_WriteLastDof()
overall_WriteDrivenDof()
RBDY3_WriteDrivenDof()
utilities_logMes('WRITE BODIES')
WriteBodies()
utilities_logMes('WRITE BEHAVIOURS')
WriteBehaviours()
utilities_logMes('WRITE DRIVEN DOF')
WriteDrivenDof()
### set periodic conditions ###
#RBDY3_SetSourcePointWithIni(2, 5.0, 12.0, 12.0, 4.0)
RBDY3_SetXPeriodicCondition(xperiode)
PRPRx_SetXPeriodicCondition(xperiode)
post3D_SetXPeriodicCondition(xperiode)
RBDY3_SetYPeriodicCondition(yperiode)
PRPRx_SetYPeriodicCondition(yperiode)
post3D_SetYPeriodicCondition(yperiode)
### post3D ##
post3D_SetDisplayedField('POSITION ')
post3D_SetDisplayedField('AVERAGE VELOCITY')
post3D_SetDisplayedField('STRESS ')
post3D_SetDisplayedField('FORCES ')
display_3D_SetDisplayedField('TACTOR')
display_3D_SetDisplayedField('INTERACTION')
post3D_Init()
display_3D_Init(0)
SetPeriodicCondition(xperiode,yperiode)
postpro_3D_PostproBeforeComputation()
OpenDisplayFiles()
OpenPostproFiles()
### compute masses ###
RBDY3_ComputeMass()
ComputeMass()
for k in range(nb_steps):
#
print 'INCREMENT STEP'
TimeEvolution_IncrementStep()
RBDY3_IncrementStep()
IncrementStep()
#
print 'DISPLAY TIMES'
TimeEvolution_DisplayStep()
#
print 'COMPUTE Fext'
RBDY3_ComputeFext()