Skip to content
This repository has been archived by the owner on Jun 10, 2022. It is now read-only.

Commit

Permalink
Merged in clang-format-ready (pull request #629)
Browse files Browse the repository at this point in the history 
Voila

Approved-by: Arnaud Botella <arnaud.botella@univ-lorraine.fr>
  • Loading branch information
@benjaminchauvin
benjaminchauvin committed Sep 6, 2017
2 parents a6e1d7f + 62c715c commit e80af74
Show file tree
Hide file tree
Showing 135 changed files with 14,654 additions and 11,066 deletions.
34 changes: 20 additions & 14 deletions doc/tutorials/src/geomodel-basics.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ int main()

using namespace RINGMesh;

try {

try
{
// This line stands for the initialization
// of Geogram and the factories of RINGMesh
// IT IS MANDATORY
Expand All @@ -72,8 +72,8 @@ int main()
// Say Hello
print_header_information();
Logger::div( "RINGMesh Training" );
Logger::out( "",
"Welcome to the RINGMesh training for basics functionalities on GeoModel !" );
Logger::out( "", "Welcome to the RINGMesh training for basics "
"functionalities on GeoModel !" );

// Next line is a feature of geogram which measure
// the time of execution.
Expand All @@ -82,32 +82,38 @@ int main()
// We instantiate the class GeoModel
GeoModel< 3 > geomodel;

//load GeoModel
//here you can load whatever the model you want in the ringmesh_home/test/data directory
// load GeoModel
// here you can load whatever the model you want in the
// ringmesh_home/test/data directory
std::string input_file_name( ringmesh_tutorials_data_path );
input_file_name += "modelA1.ml";

//function to load a geomodel
// function to load a geomodel
geomodel_load( geomodel, input_file_name );

//function to print the statistics of the geomodel in the command terminal
// function to print the statistics of the geomodel in the command
// terminal
print_geomodel_mesh_stats( geomodel );

// build volumetric mesh in regions
tetrahedralize( geomodel, "TetGen" );

//function to print the statistics of the geomodel in the command terminal
// function to print the statistics of the geomodel in the command
// terminal
print_geomodel_mesh_stats( geomodel );

//set the name of the geomodel to output
//you can customize the path
// set the name of the geomodel to output
// you can customize the path
std::string output_file_name = "modelA1.gm";
geomodel_save( geomodel, output_file_name );

} catch( const RINGMeshException& e ) {
}
catch( const RINGMeshException& e )
{
Logger::err( e.category(), e.what() );
return 1;
} catch( const std::exception& e ) {
}
catch( const std::exception& e )
{
Logger::err( "Exception", e.what() );
return 1;
}
Expand Down
107 changes: 62 additions & 45 deletions doc/tutorials/src/geomodel-building.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ int main()
{
using namespace RINGMesh;

try {

try
{
// This line stands for the initialization
// of Geogram and the factories of RINGMesh
// IT IS MANDATORY
Expand All @@ -112,7 +112,8 @@ int main()
Logger::div( "RINGMesh Training" );
Logger::out( "", "Welcome to the training of RINGMesh !" );

// Measure the time between the GEO::Stopwatch creation and its destruction.
// Measure the time between the GEO::Stopwatch creation and its
// destruction.
GEO::Stopwatch total( "Total time" );

// We instantiate the class GeoModel
Expand All @@ -131,7 +132,8 @@ int main()
// For the next section, read the documentation to understand
// the concept of Geological Entity and Mesh Entities
// Let's to a sum up of the GeoModel we try to build:
// For the Geological Entities (handle by the class GeoModelGeologicalEntity):
// For the Geological Entities (handle by the class
// GeoModelGeologicalEntity):
// 16 Contacts
index_t nb_contacts = 16;
// 1 horizons + 6 boundaries = 7 Interfaces
Expand All @@ -149,9 +151,10 @@ int main()
// 2 Regions
index_t nb_regions = 2;

//We first create the GeoModelGeoglogicalEntity
// We first create the GeoModelGeoglogicalEntity
// Create the contacts
for( index_t contact = 0; contact < nb_contacts; contact++ ) {
for( index_t contact = 0; contact < nb_contacts; contact++ )
{
builder.geology.create_geological_entity(
Contact3D::type_name_static() );
// the static method type_name_static() is available for each
Expand All @@ -161,35 +164,42 @@ int main()

// Create the Interfaces
for( index_t interface_itr = 0; interface_itr < nb_interfaces;
interface_itr++ ) {
interface_itr++ )
{
builder.geology.create_geological_entity(
Interface3D::type_name_static() );
}

// Create the Layers
for( index_t layer = 0; layer < nb_layers; layer++ ) {
builder.geology.create_geological_entity( Layer3D::type_name_static() );
for( index_t layer = 0; layer < nb_layers; layer++ )
{
builder.geology.create_geological_entity(
Layer3D::type_name_static() );
}

// Then we create the GeoModelMeshEntity
// Create the Corners
for( index_t corner = 0; corner < nb_corners; corner++ ) {
for( index_t corner = 0; corner < nb_corners; corner++ )
{
builder.topology.create_mesh_entity( Corner3D::type_name_static() );
}

// Create the Lines
for( index_t lines = 0; lines < nb_lines; lines++ ) {
for( index_t lines = 0; lines < nb_lines; lines++ )
{
builder.topology.create_mesh_entity( Line3D::type_name_static() );
}

// Create the Surfaces
for( index_t surface = 0; surface < nb_surfaces; surface++ ) {
builder.topology.create_mesh_entity( Surface3D::type_name_static() );

for( index_t surface = 0; surface < nb_surfaces; surface++ )
{
builder.topology.create_mesh_entity(
Surface3D::type_name_static() );
}

// Create the Regions
for( index_t region = 0; region < nb_regions; region++ ) {
for( index_t region = 0; region < nb_regions; region++ )
{
builder.topology.create_mesh_entity( Region3D::type_name_static() );
}

Expand All @@ -214,7 +224,8 @@ int main()
corners_table[11] = vec3( 0, 5, -1 );

// We associate the coordinates with the corners
for( index_t corner = 0; corner < nb_corners; corner++ ) {
for( index_t corner = 0; corner < nb_corners; corner++ )
{
builder.geometry.set_corner( corner, corners_table[corner] );
}

Expand Down Expand Up @@ -321,85 +332,86 @@ int main()
cur_coor_surface[1] = corners_table[1];
cur_coor_surface[2] = corners_table[2];
cur_coor_surface[3] = corners_table[3];
builder.geometry.set_surface_geometry( 0, cur_coor_surface, facet,
facet_ptr );
builder.geometry.set_surface_geometry(
0, cur_coor_surface, facet, facet_ptr );

cur_coor_surface[0] = corners_table[8];
cur_coor_surface[1] = corners_table[9];
cur_coor_surface[2] = corners_table[10];
cur_coor_surface[3] = corners_table[11];
builder.geometry.set_surface_geometry( 1, cur_coor_surface, facet,
facet_ptr );
builder.geometry.set_surface_geometry(
1, cur_coor_surface, facet, facet_ptr );

cur_coor_surface[0] = corners_table[4];
cur_coor_surface[1] = corners_table[5];
cur_coor_surface[2] = corners_table[6];
cur_coor_surface[3] = corners_table[7];
builder.geometry.set_surface_geometry( 2, cur_coor_surface, facet,
facet_ptr );
builder.geometry.set_surface_geometry(
2, cur_coor_surface, facet, facet_ptr );

cur_coor_surface[0] = corners_table[8];
cur_coor_surface[1] = corners_table[4];
cur_coor_surface[2] = corners_table[7];
cur_coor_surface[3] = corners_table[11];
builder.geometry.set_surface_geometry( 3, cur_coor_surface, facet,
facet_ptr );
builder.geometry.set_surface_geometry(
3, cur_coor_surface, facet, facet_ptr );

cur_coor_surface[0] = corners_table[0];
cur_coor_surface[1] = corners_table[8];
cur_coor_surface[2] = corners_table[11];
cur_coor_surface[3] = corners_table[3];
builder.geometry.set_surface_geometry( 4, cur_coor_surface, facet,
facet_ptr );
builder.geometry.set_surface_geometry(
4, cur_coor_surface, facet, facet_ptr );

cur_coor_surface[0] = corners_table[5];
cur_coor_surface[1] = corners_table[6];
cur_coor_surface[2] = corners_table[10];
cur_coor_surface[3] = corners_table[9];
builder.geometry.set_surface_geometry( 5, cur_coor_surface, facet,
facet_ptr );
builder.geometry.set_surface_geometry(
5, cur_coor_surface, facet, facet_ptr );

cur_coor_surface[0] = corners_table[9];
cur_coor_surface[1] = corners_table[10];
cur_coor_surface[2] = corners_table[2];
cur_coor_surface[3] = corners_table[1];
builder.geometry.set_surface_geometry( 6, cur_coor_surface, facet,
facet_ptr );
builder.geometry.set_surface_geometry(
6, cur_coor_surface, facet, facet_ptr );

cur_coor_surface[0] = corners_table[8];
cur_coor_surface[1] = corners_table[4];
cur_coor_surface[2] = corners_table[5];
cur_coor_surface[3] = corners_table[9];
builder.geometry.set_surface_geometry( 7, cur_coor_surface, facet,
facet_ptr );
builder.geometry.set_surface_geometry(
7, cur_coor_surface, facet, facet_ptr );

cur_coor_surface[0] = corners_table[0];
cur_coor_surface[1] = corners_table[8];
cur_coor_surface[2] = corners_table[9];
cur_coor_surface[3] = corners_table[1];
builder.geometry.set_surface_geometry( 8, cur_coor_surface, facet,
facet_ptr );
builder.geometry.set_surface_geometry(
8, cur_coor_surface, facet, facet_ptr );

cur_coor_surface[0] = corners_table[6];
cur_coor_surface[1] = corners_table[10];
cur_coor_surface[2] = corners_table[11];
cur_coor_surface[3] = corners_table[7];
builder.geometry.set_surface_geometry( 9, cur_coor_surface, facet,
facet_ptr );
builder.geometry.set_surface_geometry(
9, cur_coor_surface, facet, facet_ptr );

cur_coor_surface[0] = corners_table[10];
cur_coor_surface[1] = corners_table[2];
cur_coor_surface[2] = corners_table[3];
cur_coor_surface[3] = corners_table[11];
builder.geometry.set_surface_geometry( 10, cur_coor_surface, facet,
facet_ptr );
builder.geometry.set_surface_geometry(
10, cur_coor_surface, facet, facet_ptr );

//###################################
// Setting the Boundaries relations #
//###################################

//We set the Corners which are incident entities of the lines
// The add_mesh_entity_boundary_relation method take as first argument the
// We set the Corners which are incident entities of the lines
// The add_mesh_entity_boundary_relation method take as first argument
// the
// gme_t of the boundary and in second argument
// the id of the GeoModelMeshentity bounded by the boundary
// Remember :
Expand Down Expand Up @@ -899,17 +911,22 @@ int main()
// Then, we end the model building
// This method will set the missing information for the boundaries
// and parent/child relation. e. g., if you decide to use the
// add_parent_children_relation (like above), the child has no information of who
// is his parent. This method deal with that by filling the missing information
// add_parent_children_relation (like above), the child has no
// information of who
// is his parent. This method deal with that by filling the missing
// information
builder.end_geomodel();

// We save the builded model
geomodel_save( geomodel, "builded_model.gm" );

} catch( const RINGMeshException& e ) {
}
catch( const RINGMeshException& e )
{
Logger::err( e.category(), e.what() );
return 1;
} catch( const std::exception& e ) {
}
catch( const std::exception& e )
{
Logger::err( "Exception", e.what() );
return 1;
}
Expand Down
Loading

0 comments on commit e80af74

Please sign in to comment.