Commit 023cbf71 authored by Michel Henry's avatar Michel Henry
Browse files

mesh test

parent 40c184d9
Pipeline #8558 failed with stages
......@@ -897,9 +897,26 @@ size_t gmsh_mesh_entity_n_physicals(GmshMesh *mesh, int dim, int ie) {
int* gmsh_mesh_entity_physicals(GmshMesh *mesh, int dim, int ie) {
return mesh->entities[dim][ie]->physicals;
}
size_t gmsh_mesh_entity_n_elements(GmshMesh *mesh, int dim, int ie) {
size_t gmsh_mesh_entity_n_elements(GmshMesh *mesh, int dim, int ie){
return mesh->entities[dim][ie]->n_elements;
}
size_t* gmsh_mesh_entity_elements(GmshMesh *mesh, int dim, int ie){
return mesh->entities[dim][ie]->elements;
}
size_t gmsh_mesh_entity_n_nodes(GmshMesh *mesh, int dim, int ie){
return mesh->entities[dim][ie]->n_nodes;
}
size_t gmsh_mesh_entity_n_nodes_by_element(GmshMesh *mesh, int dim, int ie){
return mesh->entities[dim][ie]->n_nodes_by_element;
}
size_t* gmsh_mesh_entity_nodes_tag(GmshMesh *mesh, int dim, int ie){
return mesh->entities[dim][ie]->nodes_tag;
}
double* gmsh_mesh_entity_nodes(GmshMesh *mesh, int dim, int ie){
return mesh->entities[dim][ie]->x;
}
int gmsh_mesh_element_type(GmshMesh *mesh, int dim, int ie) {
return mesh->entities[dim][ie]->element_type;
}
......
......@@ -71,6 +71,12 @@ int gmsh_mesh_entity_dim(GmshMesh *mesh, int dimension, int ie);
size_t gmsh_mesh_entity_n_physicals(GmshMesh *mesh, int dim, int ie);
int* gmsh_mesh_entity_physicals(GmshMesh *mesh, int dimension, int ie);
size_t gmsh_mesh_entity_n_elements(GmshMesh *mesh, int dimension, int ie);
size_t* gmsh_mesh_entity_elements(GmshMesh *mesh, int dim, int ie);
size_t gmsh_mesh_entity_n_nodes(GmshMesh *mesh, int dim, int ie);
size_t gmsh_mesh_entity_n_nodes_by_element(GmshMesh *mesh, int dim, int ie);
size_t* gmsh_mesh_entity_nodes_tag(GmshMesh *mesh, int dim, int ie);
double* gmsh_mesh_entity_nodes(GmshMesh *mesh, int dim, int ie);
int gmsh_mesh_element_type(GmshMesh *mesh, int dimension, int ie);
size_t gmsh_mesh_element_tag(GmshMesh *mesh, int dim, int ie, int id);
size_t gmsh_mesh_element_n_partitions(GmshMesh *mesh, int dim, int ie);
......
......@@ -89,7 +89,7 @@ p.load_msh_boundaries("mesh.msh", ["Bottom", "Top", "X", "Z"])
p.add_particle((r,0.5,0.5), r, 4/3*r**3*np.pi*rhop)
p.add_particle((0.5,0.5,0.5), r, 4/3*r**3*np.pi*rhop)
state = p.state()
state.v[1, 0] += 0.01
state.v[1, 0] += 1
p.set_state(state)
# genInitialPosition(p,outputdir, rhop)
p.write_vtk(outputdir,0,0)
......@@ -120,7 +120,7 @@ G[:,1] = p.mass()[:,0]*g[1]
# COMPUTATION LOOP
#
while t < tEnd :
time_integration.iterate(None, p, dt,min_nsub=20, contact_tol = 1e-8,external_particles_forces=G)
time_integration.iterate(fluid, p, dt,min_nsub=20, contact_tol = 1e-8,external_particles_forces=G)
state = p.state()
state.x[:,0] = np.fmod(state.x[:,0],L)
......
Supports Markdown
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