Commit cd81d3bb authored by mozul's avatar mozul
Browse files

Squashed 'examples/' changes from da1441e..e5f8682

e5f8682 removing duplicate mur example
801823d Merge branch 'rc2015' of git-xen.lmgc.univ-montp2.fr:lmgc90/lmgc90_user_examples into rc2015
75681d7 update examples of Pre/prepro_grains for 2015 release
783cdf7 maj modele therm 3D
6c4b9fe maj modele elec
0de267e ajout mots cles manquant
d80b3dd Merge branch 'rc2015' of git-xen.lmgc.univ-montp2.fr:lmgc90/lmgc90_user_examples into rc2015
e5b8227 update display commands in rigid multi physics example for workshop
b9110d0 first update of Ateliers examples
acf58dc mise a jour des fct Ptr
b4b1e8f mise a jour des fct Ptr
580a96b first update of poro and therMAILx example
03ceb24 update mecaMAILx_RIGID_3D examples for 2015 release and add missing update of mecaMAILx_RIGID_2D
13255ca update mecaMAILx_RIGID_2D examples for 2015 release
d2b231c remove duplicate example script
b1c2a99 rename cubes_H8_explicit example in cubes_H8
50fb915 update mecaMAILx examples for 2015 release and remove cubes_H8 duplicate example
2ee408d update mecaMAILx_2D examples for 2015 release
2994047 update RIGID_3D examples for rev 2015 ddm and thermal not working yet
ea93075 update RIGID_2D example for new version

git-subtree-dir: examples
git-subtree-split: e5f8682eef4f74ebf9a107e233fb271cbdbf5035
parent bdefdcb1
......@@ -12,10 +12,10 @@ liste_inters=['DKDKx','DKJCx']
freq_detect = 1
### definition des parametres du calcul ###
Integrator_InitVerlet()
utilities_logMes('INIT TIME STEPPING')
TimeEvolution_SetTimeStep(dt)
Integrator_InitVerlet()
### model reading ###
utilities_logMes('READ BEHAVIOURS')
......@@ -61,8 +61,8 @@ InitTactorsToVTK(liste_tactors,tactors_dict)
inters_dict={}
InitIntersToVTK(liste_inters,inters_dict)
fit = startCollection('tacts.pvd')
fii = startCollection('inters.pvd')
fit = startCollection('DISPLAY/tacts.pvd')
fii = startCollection('DISPLAY/inters.pvd')
### postpro ###
postpro_PostproBeforeComputation()
......
......@@ -13,6 +13,9 @@ ref_radius =5e-3
### Set dimension in chipy for dummies ###
SetDimension(2)
### definition des parametres du calcul ###
utilities_logMes('INIT TIME STEPPING')
TimeEvolution_SetTimeStep(dt)
### initialize verlet integrator ###
Integrator_InitVerlet()
......@@ -45,9 +48,6 @@ WriteBehaviours()
utilities_logMes('WRITE DRIVEN DOF')
WriteDrivenDof()
### definition des parametres du calcul ###
utilities_logMes('INIT TIME STEPPING')
TimeEvolution_SetTimeStep(dt)
### post2D ##
OpenDisplayFiles()
......@@ -58,7 +58,6 @@ ComputeMass()
for k in xrange(0,nb_steps):
#
IncrementStep()
TimeEvolution_DisplayStep()
ComputeFext()
ComputeBulk()
......
......@@ -81,8 +81,8 @@ InitTactorsToVTK(liste_tactors,tactors_dict)
inters_dict={}
InitIntersToVTK(liste_inters,inters_dict)
fit = startCollection('tacts.pvd')
fii = startCollection('inters.pvd')
fit = startCollection('DISPLAY/tacts.pvd')
fii = startCollection('DISPLAY/inters.pvd')
### postpro ###
postpro_PostproBeforeComputation()
......
......@@ -6,7 +6,7 @@ from numpy import *
# plage de fichiers a traiter
min=1
max=10
max=100
# nom du repertoire ou on va faire le post
tmp='post'
......@@ -74,8 +74,8 @@ InitTactorsToVTK(['POLYG','JONCx'],tacts_dict)
inters_dict={}
InitIntersToVTK(['PLPLx','PLJCx'],inters_dict)
fit = startCollection('tacts.pvd')
fii = startCollection('inters.pvd')
fit = startCollection(tmp+'DISPLAY/tacts.pvd')
fii = startCollection(tmp+'DISPLAY/inters.pvd')
for k in xrange(min,max+1,1):
#
......@@ -95,9 +95,9 @@ for k in xrange(min,max+1,1):
PLJCx_ReadIniVlocRloc()
print 'tact'
writeTactorsToVTK('./DISPLAY/tacts'+'_'+str(k)+'.vtp',fit,tacts_dict)
writeTactorsToVTK(tmp+'DISPLAY/tacts'+'_'+str(k)+'.vtp',fit,tacts_dict)
print 'inter'
writeIntersToVTK('./DISPLAY/inters'+'_'+str(k)+'.vtp',fii,inters_dict,0.1e-1)
writeIntersToVTK(tmp+'DISPLAY/inters'+'_'+str(k)+'.vtp',fii,inters_dict,0.1e-1)
stopCollection(fit)
stopCollection(fii)
......
......@@ -79,8 +79,8 @@ InitTactorsToVTK(liste_tactors,tactors_dict)
inters_dict={}
InitIntersToVTK(liste_inters,inters_dict)
fit = startCollection('tacts.pvd')
fii = startCollection('inters.pvd')
fit = startCollection('DISPLAY/tacts.pvd')
fii = startCollection('DISPLAY/inters.pvd')
for k in xrange(1,nb_steps+1,1):
#
......
......@@ -78,8 +78,8 @@ InitTactorsToVTK(liste_tactors,tactors_dict)
inters_dict={}
InitIntersToVTK(liste_inters,inters_dict)
fit = startCollection('tacts.pvd')
fii = startCollection('inters.pvd')
fit = startCollection('DISPLAY/tacts.pvd')
fii = startCollection('DISPLAY/inters.pvd')
### postpro ###
postpro_PostproBeforeComputation()
......
......@@ -85,8 +85,8 @@ InitTactorsToVTK(liste_tactors,tactors_dict)
inters_dict={}
InitIntersToVTK(liste_inters,inters_dict)
fit = startCollection('tacts.pvd')
fii = startCollection('inters.pvd')
fit = startCollection('DISPLAY/tacts.pvd')
fii = startCollection('DISPLAY/inters.pvd')
nb_DISKx = DISKx_GetNbDISKx()
......
......@@ -80,3 +80,5 @@ writeDrvDof(bodies,chemin='DATBOX/')
writeDofIni(bodies,chemin='DATBOX/')
writeVlocRlocIni(chemin='DATBOX/')
post = postpro_commands()
writePostpro(commands=post, parts=bodies, path='DATBOX/')
......@@ -3,7 +3,7 @@ import os,sys
from pylmgc90.chipy import *
checkDirectories()
utilities_DisableLogMes()
#utilities_DisableLogMes()
### definition des parametres du calcul ###
dt = 2e-3
......@@ -79,8 +79,8 @@ InitTactorsToVTK(liste_tactors,tactors_dict)
inters_dict={}
InitIntersToVTK(liste_inters,inters_dict)
fit = startCollection('tacts.pvd')
fii = startCollection('inters.pvd')
fit = startCollection('DISPLAY/tacts.pvd')
fii = startCollection('DISPLAY/inters.pvd')
### postpro ###
......
......@@ -10,7 +10,7 @@ nb_steps=100
theta = 0.5
freq_display = 10
ref_radius=0.5e-2
ref_radius=1.
liste_tactors=['DISKx','JONCx']
liste_inters=['DKDKx','DKJCx']
......@@ -73,16 +73,6 @@ utilities_logMes('WRITE DRIVEN DOF')
overall_WriteDrivenDof()
RBDY2_WriteDrivenDof()
### post2D ##
tactors_dict={}
InitTactorsToVTK(liste_tactors,tactors_dict)
inters_dict={}
InitIntersToVTK(liste_inters,inters_dict)
fit = startCollection('tacts.pvd')
fii = startCollection('inters.pvd')
### postpro ###
postpro_PostproBeforeComputation()
......@@ -98,8 +88,8 @@ InitTactorsToVTK(liste_tactors,tactors_dict)
inters_dict={}
InitIntersToVTK(liste_inters,inters_dict)
fit = startCollection('tacts.pvd')
fii = startCollection('inters.pvd')
fit = startCollection('DISPLAY/tacts.pvd')
fii = startCollection('DISPLAY/inters.pvd')
for k in xrange(1,nb_steps+1,1):
......
......@@ -99,8 +99,8 @@ InitTactorsToVTK(liste_tactors,tactors_dict)
inters_dict={}
InitIntersToVTK(liste_inters,inters_dict)
fit = startCollection('tacts.pvd')
fii = startCollection('inters.pvd')
fit = startCollection('DISPLAY/tacts.pvd')
fii = startCollection('DISPLAY/inters.pvd')
for k in xrange(1,nb_steps+1,1):
#
......
......@@ -76,8 +76,8 @@ InitTactorsToVTK(liste_tactors,tactors_dict)
inters_dict={}
InitIntersToVTK(liste_inters,inters_dict)
fit = startCollection('tacts.pvd')
fii = startCollection('inters.pvd')
fit = startCollection('DISPLAY/tacts.pvd')
fii = startCollection('DISPLAY/inters.pvd')
### postpro ###
postpro_PostproBeforeComputation()
......
......@@ -68,7 +68,6 @@ ComputeMass()
for k in xrange(1,nb_steps+1,1):
#
IncrementStep()
TimeEvolution_DisplayStep()
ComputeFext()
ComputeBulk()
ComputeFreeVelocity()
......
......@@ -84,8 +84,8 @@ InitTactorsToVTK(liste_tactors,tactors_dict)
inters_dict={}
InitIntersToVTK(liste_inters,inters_dict)
fit = startCollection('tacts.pvd')
fii = startCollection('inters.pvd')
fit = startCollection('DISPLAY/tacts.pvd')
fii = startCollection('DISPLAY/inters.pvd')
for k in range(nb_iter):
#
......
......@@ -7,7 +7,7 @@ checkDirectories()
### definition des parametres du calcul ###
dt = 2e-4
nb_steps = 5000
nb_steps = 3000
theta = 0.5
freq_display = 100
......@@ -79,8 +79,8 @@ InitTactorsToVTK(liste_tactors,tactors_dict)
inters_dict={}
InitIntersToVTK(liste_inters,inters_dict)
fit = startCollection('tacts.pvd')
fii = startCollection('inters.pvd')
fit = startCollection('DISPLAY/tacts.pvd')
fii = startCollection('DISPLAY/inters.pvd')
### postpro ###
postpro_PostproBeforeComputation()
......
......@@ -4,7 +4,7 @@ from pylmgc90.chipy import *
checkDirectories()
dt = 2e-4
nb_steps = 5000
nb_steps = 3000
theta = 0.5
freq_detect = 1
......
......@@ -93,8 +93,8 @@ vjc = np.zeros([nbjc])
inters_dict={}
InitIntersToVTK(liste_inters,inters_dict)
fit = startCollection('tacts.pvd')
fii = startCollection('inters.pvd')
fit = startCollection('DISPLAY/tacts.pvd')
fii = startCollection('DISPLAY/inters.pvd')
for k in xrange(1,nb_steps+1,1):
#
......
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