Skip to content

Commit ec88ed8

Browse files
AlgianeAlgiane
committed
Merge branch 'hotfix/5.0.2' into develop:
- Change the location of header file installation ('include/mmg/mmg3d' instead of 'include' directory). - Thanks to P. Saramito: Now the library has a suitable 'soname'. - Add contacts information to the AUTHORS file. - Cleaner way to list header files. - Add man pages + add info on memory usage and scotch rembering for the -val option.
1 parent 4215cef commit ec88ed8

File tree

13 files changed

+70
-30
lines changed

13 files changed

+70
-30
lines changed

‎AUTHORS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ UPMC = Université Pierre et Marie Curie
2020

2121
Contact:
2222
--------
23-
23+
[email protected]

‎CMakeLists.txt

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -301,17 +301,6 @@ IF ( BUILD_MMG3D OR BUILD_MMG )
301301
SET_TARGET_PROPERTIES(${PROJECT_NAME}3d_a PROPERTIES OUTPUT_NAME
302302
${PROJECT_NAME}3d)
303303
TARGET_LINK_LIBRARIES(${PROJECT_NAME}3d_a ${LIBRARIES})
304-
INSTALL(FILES ${MMG3D_SOURCE_DIR}/lib${PROJECT_NAME}3df.h DESTINATION
305-
include)
306-
INSTALL(FILES ${MMG3D_SOURCE_DIR}/lib${PROJECT_NAME}3d.h DESTINATION
307-
include)
308-
INSTALL(FILES ${COMMON_SOURCE_DIR}/libmmg.h DESTINATION
309-
include)
310-
INSTALL(FILES ${COMMON_SOURCE_DIR}/mmg.h DESTINATION
311-
include)
312-
INSTALL(FILES ${COMMON_SOURCE_DIR}/eigenv.h DESTINATION
313-
include)
314-
INSTALL(FILES ${COMMON_SOURCE_DIR}/chrono.h DESTINATION include)
315304
INSTALL(TARGETS ${PROJECT_NAME}3d_a
316305
ARCHIVE DESTINATION lib
317306
LIBRARY DESTINATION lib)
@@ -323,25 +312,30 @@ IF ( BUILD_MMG3D OR BUILD_MMG )
323312
ADD_LIBRARY(${PROJECT_NAME}3d_so SHARED
324313
${MMG3D_SOURCE_DIR}/lib${PROJECT_NAME}3df.h
325314
${source_files} ${lib_file})
315+
SET_TARGET_PROPERTIES(${PROJECT_NAME}3d_so PROPERTIES
316+
VERSION 5.0.0 SOVERSION 5)
326317
SET_TARGET_PROPERTIES(${PROJECT_NAME}3d_so PROPERTIES
327318
OUTPUT_NAME ${PROJECT_NAME}3d)
328319
TARGET_LINK_LIBRARIES(${PROJECT_NAME}3d_so ${LIBRARIES})
329-
INSTALL(FILES ${MMG3D_SOURCE_DIR}/lib${PROJECT_NAME}3df.h
330-
DESTINATION include)
331-
INSTALL(FILES ${MMG3D_SOURCE_DIR}/lib${PROJECT_NAME}3d.h
332-
DESTINATION include)
333-
INSTALL(FILES ${COMMON_SOURCE_DIR}/libmmg.h DESTINATION
334-
include)
335-
INSTALL(FILES ${COMMON_SOURCE_DIR}/mmg.h DESTINATION
336-
include)
337-
INSTALL(FILES ${COMMON_SOURCE_DIR}/eigenv.h DESTINATION
338-
include)
339-
INSTALL(FILES ${COMMON_SOURCE_DIR}/chrono.h DESTINATION include)
340320
INSTALL(TARGETS ${PROJECT_NAME}3d_so
341321
ARCHIVE DESTINATION
342322
LIBRARY DESTINATION lib)
343323
ENDIF()
344324

325+
IF ( LIBMMG3D_STATIC OR LIBMMG3D_SHARED )
326+
# mmg3d header files needed for library
327+
SET( mmg3d_headers
328+
${MMG3D_SOURCE_DIR}/libmmg3d.h
329+
${MMG3D_SOURCE_DIR}/libmmg3df.h
330+
${COMMON_SOURCE_DIR}/mmg.h
331+
${COMMON_SOURCE_DIR}/eigenv.h
332+
${COMMON_SOURCE_DIR}/libmmg.h
333+
${COMMON_SOURCE_DIR}/chrono.h
334+
)
335+
336+
INSTALL(FILES ${mmg3d_headers} DESTINATION include/mmg/mmg3d)
337+
ENDIF()
338+
345339
############################################################################
346340
#####
347341
##### Compile program to test library

‎doc/man/mmg3d.1.gz

1.8 KB
Binary file not shown.

‎doc/man/mmgs.1.gz

1.42 KB
Binary file not shown.

‎libexamples/mmg3d/example0/example0_a/main.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@
3333
#include <math.h>
3434
#include <float.h>
3535

36+
/** Include the mmg3d library hader file */
37+
// if the header file is in the "include" directory
3638
#include "libmmg3d.h"
39+
// if the header file is in "include/mmg/mmg3d"
40+
// #include "mmg/mmg3d/libmmg3d.h"
3741

3842
int main(int argc,char *argv[]) {
3943
MMG5_pMesh mmgMesh;

‎libexamples/mmg3d/example0/example0_b/main.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@
3333
#include <math.h>
3434
#include <float.h>
3535

36+
/** Include the mmg3d library hader file */
37+
// if the header file is in the "include" directory
3638
#include "libmmg3d.h"
39+
// if the header file is in "include/mmg/mmg3d"
40+
// #include "mmg/mmg3d/libmmg3d.h"
3741

3842
#define MAX0(a,b) (((a) > (b)) ? (a) : (b))
3943
#define MAX(a,b,c,d) (((MAX0(a,b)) > (MAX0(c,d))) ? (MAX0(a,b)) : (MAX0(c,d)))
@@ -191,7 +195,7 @@ int main(int argc,char *argv[]) {
191195
for(k=1; k<=np; k++) {
192196
/** b) Vertex recovering */
193197
if ( !MMG5_Get_vertex(mmgMesh,&(Point[0]),&(Point[1]),&(Point[2]),
194-
&ref,&(corner[k]),&(required[k])) ) exit(EXIT_FAILURE);
198+
&ref,&(corner[k]),&(required[k])) ) exit(EXIT_FAILURE);
195199
fprintf(inm,"%.15lg %.15lg %.15lg %d \n",Point[0],Point[1],Point[2],ref);
196200
if ( corner[k] ) nc++;
197201
if ( required[k] ) nreq++;
@@ -212,7 +216,7 @@ int main(int argc,char *argv[]) {
212216
for(k=1; k<=nt; k++) {
213217
/** d) Triangles recovering */
214218
if ( !MMG5_Get_triangle(mmgMesh,&(Tria[0]),&(Tria[1]),&(Tria[2]),
215-
&ref,&(required[k])) ) exit(EXIT_FAILURE);
219+
&ref,&(required[k])) ) exit(EXIT_FAILURE);
216220
fprintf(inm,"%d %d %d %d \n",Tria[0],Tria[1],Tria[2],ref);
217221
if ( required[k] ) nreq++;
218222
}
@@ -226,7 +230,7 @@ int main(int argc,char *argv[]) {
226230
for(k=1; k<=na; k++) {
227231
/** e) Edges recovering */
228232
if ( !MMG5_Get_edge(mmgMesh,&(Edge[0]),&(Edge[1]),&ref,
229-
&(ridge[k]),&(required[k])) ) exit(EXIT_FAILURE);
233+
&(ridge[k]),&(required[k])) ) exit(EXIT_FAILURE);
230234
fprintf(inm,"%d %d %d \n",Edge[0],Edge[1],ref);
231235
if ( ridge[k] ) nr++;
232236
if ( required[k] ) nreq++;
@@ -245,7 +249,7 @@ int main(int argc,char *argv[]) {
245249
for(k=1; k<=ne; k++) {
246250
/** c) Tetra recovering */
247251
if ( !MMG5_Get_tetrahedron(mmgMesh,&(Tetra[0]),&(Tetra[1]),&(Tetra[2]),&(Tetra[3]),
248-
&ref,&(required[k])) ) exit(EXIT_FAILURE);
252+
&ref,&(required[k])) ) exit(EXIT_FAILURE);
249253
fprintf(inm,"%d %d %d %d %d \n",Tetra[0],Tetra[1],Tetra[2],Tetra[3],ref);
250254
if ( required[k] ) nreq++;
251255
}

‎libexamples/mmg3d/example0_fortran/example0_a/main.F90

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
!> @brief
44
!> Example for using mmg3dlib (basic use)
55

6+
!> Include the mmg3d library hader file
7+
! if the header file is in the "include" directory
68
#include "libmmg3df.h"
9+
! if the header file is in "include/mmg/mmg3d"
10+
! #include "mmg/mmg3d/libmmg3d.h"
711

812
PROGRAM main
913

‎libexamples/mmg3d/example0_fortran/example0_b/main.F90

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@
33
!> @brief
44
!> Example for using mmg3dlib (basic use)
55

6+
7+
!> Include the mmg3d library hader file
8+
! if the header file is in the "include" directory
69
#include "libmmg3df.h"
10+
! if the header file is in "include/mmg/mmg3d"
11+
! #include "mmg/mmg3d/libmmg3d.h"
712

813
PROGRAM main
914
MMG5_DATA_PTR_T :: mmgMesh

‎libexamples/mmg3d/example1/main.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@
3333
#include <math.h>
3434
#include <float.h>
3535

36+
/** Include the mmg3d library hader file */
37+
// if the header file is in the "include" directory
3638
#include "libmmg3d.h"
39+
// if the header file is in "include/mmg/mmg3d"
40+
// #include "mmg/mmg3d/libmmg3d.h"
3741

3842
int main(int argc,char *argv[]) {
3943
MMG5_pMesh mmgMesh;

‎libexamples/mmg3d/example2/main.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@
3333
#include <math.h>
3434
#include <float.h>
3535

36+
/** Include the mmg3d library hader file */
37+
// if the header file is in the "include" directory
3638
#include "libmmg3d.h"
39+
// if the header file is in "include/mmg/mmg3d"
40+
// #include "mmg/mmg3d/libmmg3d.h"
3741

3842
int main(int argc,char *argv[]) {
3943
MMG5_pMesh mmgMesh;

‎libexamples/mmg3d/example3/mmg3d.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@
3333
#include <memory.h>
3434
#include <ctype.h>
3535

36+
/** Include the mmg3d library hader file */
37+
// if the header file is in the "include" directory
3638
#include "libmmg3d.h"
39+
// if the header file is in "include/mmg/mmg3d"
40+
// #include "mmg/mmg3d/libmmg3d.h"
3741

3842
mytime ctim[TIMEMAX];
3943

@@ -117,9 +121,9 @@ int main(int argc,char *argv[]) {
117121
else {
118122
MMG5_Get_solSize( mesh, met, &dummy, &dummy, &typSol);
119123
if ( typSol != MMG5_Scalar ) {
120-
fprintf(stdout," ## ERROR: ANISOTROPIC METRIC NOT IMPLEMENTED.\n");
121-
MMG5_Free_all(mesh,met);
122-
return(MMG5_STRONGFAILURE);
124+
fprintf(stdout," ## ERROR: ANISOTROPIC METRIC NOT IMPLEMENTED.\n");
125+
MMG5_Free_all(mesh,met);
126+
return(MMG5_STRONGFAILURE);
123127
}
124128
}
125129
if ( MMG5_Get_iparameter(mesh, MMG5_IPARAM_iso) && !ier ) {

‎src/common/mmg.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,24 @@ void _MMG5_mmgUsage(char *prog) {
7373
*
7474
*/
7575
void _MMG5_mmgDefaultValues(MMG5_pMesh mesh) {
76+
long long memMax;
7677

7778
fprintf(stdout,"\nDefault parameters values:\n");
7879

7980
fprintf(stdout,"\n** Generic options :\n");
8081
fprintf(stdout,"verbosity (-v) : %d\n",
8182
mesh->info.imprim);
83+
memMax = _MMG5_memSize();
84+
if ( memMax )
85+
/* maximal memory = 50% of total physical memory */
86+
memMax = memMax*50/104857600L;
87+
else {
88+
/* default value = 800 Mo */
89+
memMax = _MMG5_MEMMAX;
90+
}
91+
fprintf(stdout,"maximal memory size (-m) : %lld MBytes\n",
92+
memMax);
93+
8294

8395
fprintf(stdout,"\n** Parameters\n");
8496
fprintf(stdout,"angle detection (-ar) : %lf\n",

‎src/mmg3d/pampautils.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,11 @@ void _MMG5_defaultValues(MMG5_pMesh mesh) {
178178
fprintf(stdout,"Bucket size per dimension (-bucket) : %d\n",
179179
mesh->info.bucket);
180180
#endif
181+
#ifdef USE_SCOTCH
182+
fprintf(stdout,"SCOTCH renumbering : enabled\n");
183+
#else
184+
fprintf(stdout,"SCOTCH renumbering : disabled\n");
185+
#endif
181186

182187
exit(EXIT_FAILURE);
183188
}

0 commit comments

Comments
 (0)