Skip to content

Commit 4215cef

Browse files
AlgianeAlgiane
committed
Revert "Change the location of header file installation ('include/mmg/mmg3d' instead of 'include' directory)."
This reverts commit 70902f2.
1 parent 70902f2 commit 4215cef

File tree

13 files changed

+32
-72
lines changed

13 files changed

+32
-72
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-
[email protected]
23+

‎CMakeLists.txt

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,17 @@ 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)
304315
INSTALL(TARGETS ${PROJECT_NAME}3d_a
305316
ARCHIVE DESTINATION lib
306317
LIBRARY DESTINATION lib)
@@ -312,30 +323,25 @@ IF ( BUILD_MMG3D OR BUILD_MMG )
312323
ADD_LIBRARY(${PROJECT_NAME}3d_so SHARED
313324
${MMG3D_SOURCE_DIR}/lib${PROJECT_NAME}3df.h
314325
${source_files} ${lib_file})
315-
SET_TARGET_PROPERTIES(${PROJECT_NAME}3d_so PROPERTIES
316-
VERSION 5.0.0 SOVERSION 5)
317326
SET_TARGET_PROPERTIES(${PROJECT_NAME}3d_so PROPERTIES
318327
OUTPUT_NAME ${PROJECT_NAME}3d)
319328
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)
320340
INSTALL(TARGETS ${PROJECT_NAME}3d_so
321341
ARCHIVE DESTINATION
322342
LIBRARY DESTINATION lib)
323343
ENDIF()
324344

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-
339345
############################################################################
340346
#####
341347
##### 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: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@
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
3836
#include "libmmg3d.h"
39-
// if the header file is in "include/mmg/mmg3d"
40-
// #include "mmg/mmg3d/libmmg3d.h"
4137

4238
int main(int argc,char *argv[]) {
4339
MMG5_pMesh mmgMesh;

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@
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
3836
#include "libmmg3d.h"
39-
// if the header file is in "include/mmg/mmg3d"
40-
// #include "mmg/mmg3d/libmmg3d.h"
4137

4238
#define MAX0(a,b) (((a) > (b)) ? (a) : (b))
4339
#define MAX(a,b,c,d) (((MAX0(a,b)) > (MAX0(c,d))) ? (MAX0(a,b)) : (MAX0(c,d)))
@@ -195,7 +191,7 @@ int main(int argc,char *argv[]) {
195191
for(k=1; k<=np; k++) {
196192
/** b) Vertex recovering */
197193
if ( !MMG5_Get_vertex(mmgMesh,&(Point[0]),&(Point[1]),&(Point[2]),
198-
&ref,&(corner[k]),&(required[k])) ) exit(EXIT_FAILURE);
194+
&ref,&(corner[k]),&(required[k])) ) exit(EXIT_FAILURE);
199195
fprintf(inm,"%.15lg %.15lg %.15lg %d \n",Point[0],Point[1],Point[2],ref);
200196
if ( corner[k] ) nc++;
201197
if ( required[k] ) nreq++;
@@ -216,7 +212,7 @@ int main(int argc,char *argv[]) {
216212
for(k=1; k<=nt; k++) {
217213
/** d) Triangles recovering */
218214
if ( !MMG5_Get_triangle(mmgMesh,&(Tria[0]),&(Tria[1]),&(Tria[2]),
219-
&ref,&(required[k])) ) exit(EXIT_FAILURE);
215+
&ref,&(required[k])) ) exit(EXIT_FAILURE);
220216
fprintf(inm,"%d %d %d %d \n",Tria[0],Tria[1],Tria[2],ref);
221217
if ( required[k] ) nreq++;
222218
}
@@ -230,7 +226,7 @@ int main(int argc,char *argv[]) {
230226
for(k=1; k<=na; k++) {
231227
/** e) Edges recovering */
232228
if ( !MMG5_Get_edge(mmgMesh,&(Edge[0]),&(Edge[1]),&ref,
233-
&(ridge[k]),&(required[k])) ) exit(EXIT_FAILURE);
229+
&(ridge[k]),&(required[k])) ) exit(EXIT_FAILURE);
234230
fprintf(inm,"%d %d %d \n",Edge[0],Edge[1],ref);
235231
if ( ridge[k] ) nr++;
236232
if ( required[k] ) nreq++;
@@ -249,7 +245,7 @@ int main(int argc,char *argv[]) {
249245
for(k=1; k<=ne; k++) {
250246
/** c) Tetra recovering */
251247
if ( !MMG5_Get_tetrahedron(mmgMesh,&(Tetra[0]),&(Tetra[1]),&(Tetra[2]),&(Tetra[3]),
252-
&ref,&(required[k])) ) exit(EXIT_FAILURE);
248+
&ref,&(required[k])) ) exit(EXIT_FAILURE);
253249
fprintf(inm,"%d %d %d %d %d \n",Tetra[0],Tetra[1],Tetra[2],Tetra[3],ref);
254250
if ( required[k] ) nreq++;
255251
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
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
8-
#include "libmmg3d.h"
9-
! if the header file is in "include/mmg/mmg3d"
10-
! #include "mmg/mmg3d/libmmg3d.h"
6+
#include "libmmg3df.h"
117

128
PROGRAM main
139

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
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
9-
#include "libmmg3d.h"
10-
! if the header file is in "include/mmg/mmg3d"
11-
! #include "mmg/mmg3d/libmmg3d.h"
6+
#include "libmmg3df.h"
127

138
PROGRAM main
149
MMG5_DATA_PTR_T :: mmgMesh

‎libexamples/mmg3d/example1/main.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@
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
3836
#include "libmmg3d.h"
39-
// if the header file is in "include/mmg/mmg3d"
40-
// #include "mmg/mmg3d/libmmg3d.h"
4137

4238
int main(int argc,char *argv[]) {
4339
MMG5_pMesh mmgMesh;

‎libexamples/mmg3d/example2/main.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@
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
3836
#include "libmmg3d.h"
39-
// if the header file is in "include/mmg/mmg3d"
40-
// #include "mmg/mmg3d/libmmg3d.h"
4137

4238
int main(int argc,char *argv[]) {
4339
MMG5_pMesh mmgMesh;

‎libexamples/mmg3d/example3/mmg3d.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@
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
3836
#include "libmmg3d.h"
39-
// if the header file is in "include/mmg/mmg3d"
40-
// #include "mmg/mmg3d/libmmg3d.h"
4137

4238
mytime ctim[TIMEMAX];
4339

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

‎src/common/mmg.c

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

7877
fprintf(stdout,"\nDefault parameters values:\n");
7978

8079
fprintf(stdout,"\n** Generic options :\n");
8180
fprintf(stdout,"verbosity (-v) : %d\n",
8281
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-
9482

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

‎src/mmg3d/pampautils.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,6 @@ 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
186181

187182
exit(EXIT_FAILURE);
188183
}

0 commit comments

Comments
 (0)