Skip to content

Commit 24011bc

Browse files
committed
remove error in script with more the 100 comment consecutive
lines of comment // (Thank to R. Michel) correct in check lib hdf5 (missing -lhdf5 or double -lhdf5 -lhdf5 ). a new print in case of err th meshS trunc caes
1 parent 38c51c8 commit 24011bc

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

etc/config/m4/ax_lib_hdf5.m4

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,10 +241,7 @@ HDF5 support is being disabled (equivalent to --with-hdf5=no).
241241
ff_hlib="";
242242
# remove -lhdf5
243243
for arg in $HDF5_LIBS; do if [ "-lhdf5" != "$arg" ] ;then ff_hlib="$ff_hlib $arg"; fi;done
244-
HDF5_LIBS="-lhdf5 $ff_hlib" # add -lhdf5
245-
# test "${HDF5_LIBS#*"-lhdf5"}" == "$HDF5_LIBS" && HDF5_LIBS="-lhdf5 $HDF5_LIBS"
246-
# HDF5_LIBS="-lhdf5 $HDF5_LIBS"
247-
# remove double -lhdf5
244+
HDF5_LIBS="$ff_hlib -lhdf5" # add -lhdf5
248245
AC_MSG_RESULT([yes (version $[HDF5_VERSION])])
249246
250247
dnl See if we can compile

src/fflib/lex.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ int mylex::EatCommentAndSpace(string *data)
261261
do // loop on type of comment !!
262262
{
263263
// cout << "incomment"<< incomment << " "<< int(c) << " " << c << endl;
264-
ffassert(count++<100);
264+
ffassert(count++<10000);
265265
eatspaces();
266266
// eat markdown <CR>~~~ or comment
267267
if(incomment==1 && (ifblock('~')==1 ||ifblock('`')==1 )) {

src/fflib/msh3.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5425,6 +5425,7 @@ MeshS *truncmesh(const MeshS &Th, const long &kksplit, int *split, bool WithMort
54255425
int np = 0; // nb of new points ..
54265426

54275427
// first build old point to keep the numbering order for DDM ...
5428+
int err= 0;
54285429
for (int i = 0, k = 0; i < Th.nv; i++) {
54295430
if (takevertex[i] >= 0) {
54305431
Vertex3 *pvi = gtree->ToClose(Th(i), hseuil,true);
@@ -5434,10 +5435,15 @@ MeshS *truncmesh(const MeshS &Th, const long &kksplit, int *split, bool WithMort
54345435
gtree->Add(vertices[np]);
54355436
np++;
54365437
} else {
5437-
ffassert(0);
5438+
err++;
5439+
cout << " same point ("<< i << " "<< Th(i) <<" == " << *pvi << " diff "<< R3(*pvi,Th(i)).norme() << endl;
54385440
}
54395441
}
54405442
}
5443+
if(err){
5444+
cout << " double point with eps ="<<hseuil<< endl;
5445+
ffassert(0);
5446+
}
54415447

54425448
KN< R3 > vertextrisub(nvsub);
54435449
KN< int > newindex(nvsub);

0 commit comments

Comments
 (0)