Skip to content

Commit 6292ebe

Browse files
AlgianeAlgiane
committed
Merge branch 'master' into develop
2 parents fdaa955 + 7c251e4 commit 6292ebe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+317
-298
lines changed

‎CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ MARK_AS_ADVANCED ( CI_DIR )
4646
###############################################################################
4747
SET (CMAKE_RELEASE_VERSION_MAJOR "5" )
4848
SET (CMAKE_RELEASE_VERSION_MINOR "3" )
49-
SET (CMAKE_RELEASE_VERSION_PATCH "11" )
50-
SET (CMAKE_RELEASE_DATE "Apr. 10, 2017" )
49+
SET (CMAKE_RELEASE_VERSION_PATCH "12" )
50+
SET (CMAKE_RELEASE_DATE "Oct. 2, 2018" )
5151

5252
SET (CMAKE_RELEASE_VERSION
5353
"${CMAKE_RELEASE_VERSION_MAJOR}.${CMAKE_RELEASE_VERSION_MINOR}.${CMAKE_RELEASE_VERSION_PATCH}")

‎doc/man/mmg2d.1.gz

-1 Bytes
Binary file not shown.

‎doc/man/mmg3d.1.gz

0 Bytes
Binary file not shown.

‎doc/man/mmgs.1.gz

-1 Bytes
Binary file not shown.

‎src/common/API_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void _MMG5_Init_parameters(MMG5_pMesh mesh) {
5454

5555
/* default values for integers */
5656
/** MMG5_IPARAM_verbose = 1 */
57-
mesh->info.imprim = 1; /* [-10..10],Tune level of imprim */
57+
mesh->info.imprim = 1; /* [-1..10], Tune level of imprim */
5858
/** MMG*_IPARAM_iso = 0 */
5959
mesh->info.iso = 0; /* [0/1] ,Turn on/off levelset meshing */
6060
/** MMG5_IPARAM_mem = -1 */

‎src/common/inout.c

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,9 @@ int MMG5_loadMshMesh_part1(MMG5_pMesh mesh,const char *filename,
293293
return 0;
294294
}
295295
}
296-
fprintf(stdout," %%%% %s OPENED\n",data);
296+
297+
if ( mesh->info.imprim >= 0 )
298+
fprintf(stdout," %%%% %s OPENED\n",data);
297299
_MMG5_SAFE_FREE(data);
298300

299301

@@ -1529,7 +1531,8 @@ int MMG5_saveMshMesh(MMG5_pMesh mesh,MMG5_pSol *sol,const char *filename,
15291531
}
15301532
}
15311533

1532-
fprintf(stdout," %%%% %s OPENED\n",data);
1534+
if ( mesh->info.imprim >= 0 )
1535+
fprintf(stdout," %%%% %s OPENED\n",data);
15331536
_MMG5_SAFE_FREE(data);
15341537

15351538
/* Entete fichier*/
@@ -1932,6 +1935,7 @@ int MMG5_saveMshMesh(MMG5_pMesh mesh,MMG5_pSol *sol,const char *filename,
19321935
* \param nsols number of solutions of different types in the file
19331936
* \param type type of solutions
19341937
* \param posnp pointer toward the position of the point list in the file
1938+
* \param imprim verbosity
19351939
*
19361940
* \return -1 data invalid or we fail, 0 no file, 1 ok.
19371941
*
@@ -1940,7 +1944,7 @@ int MMG5_saveMshMesh(MMG5_pMesh mesh,MMG5_pSol *sol,const char *filename,
19401944
*/
19411945
int MMG5_loadSolHeader( const char *filename,int meshDim,FILE **inm,int *ver,
19421946
int *bin,int *iswp,int *np,int *dim,int *nsols,int **type,
1943-
long *posnp) {
1947+
long *posnp, int imprim) {
19441948
int binch,bdim;
19451949
int bpos,i;
19461950
char *ptr,*data,chaine[128];
@@ -1967,7 +1971,8 @@ int MMG5_loadSolHeader( const char *filename,int meshDim,FILE **inm,int *ver,
19671971
*ptr = '\0';
19681972
strcat(data,".sol");
19691973
if (!(*inm = fopen(data,"rb")) ) {
1970-
fprintf(stderr," ** %s NOT FOUND. USE DEFAULT METRIC.\n",data);
1974+
if ( imprim >= 0 )
1975+
fprintf(stderr," ** %s NOT FOUND. USE DEFAULT METRIC.\n",data);
19711976
_MMG5_SAFE_FREE(data);
19721977
return 0;
19731978
}
@@ -1980,12 +1985,14 @@ int MMG5_loadSolHeader( const char *filename,int meshDim,FILE **inm,int *ver,
19801985
if ( ptr ) *bin = 1;
19811986

19821987
if (!(*inm = fopen(data,"rb")) ) {
1983-
fprintf(stderr," ** %s NOT FOUND. USE DEFAULT METRIC.\n",data);
1988+
if ( imprim >= 0 )
1989+
fprintf(stderr," ** %s NOT FOUND. USE DEFAULT METRIC.\n",data);
19841990
_MMG5_SAFE_FREE(data);
19851991
return 0;
19861992
}
19871993
}
1988-
fprintf(stdout," %%%% %s OPENED\n",data);
1994+
if ( imprim >= 0 )
1995+
fprintf(stdout," %%%% %s OPENED\n",data);
19891996
_MMG5_SAFE_FREE(data);
19901997

19911998
/* read solution or metric */
@@ -2278,7 +2285,8 @@ int MMG5_saveSolHeader( MMG5_pMesh mesh,const char *filename,
22782285
}
22792286
}
22802287

2281-
fprintf(stdout," %%%% %s OPENED\n",data);
2288+
if ( mesh->info.imprim >= 0 )
2289+
fprintf(stdout," %%%% %s OPENED\n",data);
22822290
_MMG5_SAFE_FREE(data);
22832291

22842292
/*entete fichier*/

‎src/common/mmg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void _MMG5_mmgUsage(char *prog) {
4646

4747
fprintf(stdout,"\n** Generic options :\n");
4848
fprintf(stdout,"-h Print this message\n");
49-
fprintf(stdout,"-v [n] Tune level of verbosity, [-10..10]\n");
49+
fprintf(stdout,"-v [n] Tune level of verbosity, [-1..10]\n");
5050
fprintf(stdout,"-m [n] Set maximal memory size to n Mbytes\n");
5151
fprintf(stdout,"-d Turn on debug mode\n");
5252
fprintf(stdout,"-val Print the default parameters values\n");

‎src/common/mmgcommon.h.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ extern "C" {
150150
#define _MMG5_KA 7 /*!< Key for hash tables. */
151151
#define _MMG5_KB 11 /*!< Key for hash tables. */
152152

153-
154153
/** Reset the customized signals and set the internal counters of points, edges,
155154
* tria and tetra to the suitable value (needed by users to recover their mesh
156155
* using the API) */
@@ -573,7 +572,7 @@ typedef struct _MMG5_dNode_s {
573572
const int nsols);
574573
int MMG5_saveMshMesh(MMG5_pMesh,MMG5_pSol*,const char*,const int);
575574
int MMG5_loadSolHeader(const char*,int,FILE**,int*,int*,int*,int*,
576-
int*,int*,int**,long*);
575+
int*,int*,int**,long*,int);
577576
int MMG5_chkMetricType(MMG5_pMesh mesh,int *type, FILE *inm);
578577
void MMG5_readFloatSol3D(MMG5_pSol,FILE*,int,int,int);
579578
void MMG5_readDoubleSol3D(MMG5_pSol,FILE*,int,int,int);

‎src/mmg2d/analys_2d.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ int _MMG2_regnor(MMG5_pMesh mesh) {
607607
ppt->s = 0;
608608
}
609609

610-
if ( mesh->info.imprim < 0 || mesh->info.ddebug ) fprintf(stdout,"\n");
610+
if ( mesh->info.imprim < -1 || mesh->info.ddebug ) fprintf(stdout,"\n");
611611

612612
if ( abs(mesh->info.imprim) > 4 )
613613
fprintf(stdout," %d normals regularized: %.3e\n",nn,res);

‎src/mmg2d/hash_2d.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ int MMG2_pack(MMG5_pMesh mesh,MMG5_pSol sol) {
573573
mesh->nenil = 0;
574574
}
575575

576-
if ( mesh->info.imprim ) {
576+
if ( mesh->info.imprim > 0 ) {
577577
fprintf(stdout," NUMBER OF VERTICES %8d CORNERS %8d\n",mesh->np,nc);
578578
fprintf(stdout," NUMBER OF TRIANGLES %8d\n",mesh->nt);
579579

‎src/mmg2d/inout_2d.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ int MMG2D_loadMesh(MMG5_pMesh mesh,const char *filename) {
124124
return 0;
125125
}
126126
}
127-
fprintf(stdout," %%%% %s OPENED\n",data);
127+
if ( mesh->info.imprim >= 0 )
128+
fprintf(stdout," %%%% %s OPENED\n",data);
128129
_MMG5_SAFE_FREE(data);
129130

130131
if (!bin) {
@@ -308,9 +309,6 @@ int MMG2D_loadMesh(MMG5_pMesh mesh,const char *filename) {
308309
fprintf(stdout," ** MISSING DATA : no point\n");
309310
return 0;
310311
}
311-
if (!mesh->nt) {
312-
fprintf(stdout," **WARNING NO GIVEN TRIANGLE\n");
313-
}
314312

315313
mesh->npi = mesh->np;
316314
mesh->nai = mesh->na;
@@ -796,7 +794,7 @@ int MMG2D_loadSol(MMG5_pMesh mesh,MMG5_pSol sol,const char *filename) {
796794

797795
/** Read the file header */
798796
ier = MMG5_loadSolHeader(filename,2,&inm,&ver,&bin,&iswp,&np,&dim,&nsols,
799-
&type,&posnp);
797+
&type,&posnp,mesh->info.imprim);
800798

801799
if ( ier < 1 ) return ier;
802800

@@ -875,7 +873,7 @@ int MMG2D_loadAllSols(MMG5_pMesh mesh,MMG5_pSol *sol, const char *filename) {
875873

876874
/** Read the file header */
877875
ier = MMG5_loadSolHeader(filename,2,&inm,&ver,&bin,&iswp,&np,&dim,&nsols,
878-
&type,&posnp);
876+
&type,&posnp,mesh->info.imprim);
879877
if ( ier < 1 ) return ier;
880878

881879
if ( mesh->np != np ) {
@@ -1003,7 +1001,9 @@ int MMG2D_saveMesh(MMG5_pMesh mesh,const char *filename) {
10031001
return 0;
10041002
}
10051003
}
1006-
fprintf(stdout," %%%% %s OPENED\n",data);
1004+
1005+
if ( mesh->info.imprim >= 0 )
1006+
fprintf(stdout," %%%% %s OPENED\n",data);
10071007
_MMG5_SAFE_FREE(data);
10081008

10091009
/* Write header */

0 commit comments

Comments
 (0)