Skip to content

Commit b80aed3

Browse files
committed
Fix compatibility with Gmsh 4.12.2
Made simple change to get compatibility with Gmsh 4.12.2.
1 parent 00e812c commit b80aed3

File tree

5 files changed

+30
-4
lines changed

5 files changed

+30
-4
lines changed

VERSIONS

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
New in 4.8.1-1 (24 Jan 2024):
2+
3+
- general: fixed compatibility with Gmsh (version 4.12.2).
4+
15
New in 4.8.0 (09 Jan 2024):
26
- module -T: fixed weibull distribution, made minor fixes.
37
- module -M: changed default value of -order to 2, changed -nset default value
@@ -6,7 +10,7 @@ New in 4.8.0 (09 Jan 2024):
610
- module -V: fixed -datanodecoofact.
711
- module -S: changed simulation.config onto simulation.cfg.
812
- documentation: made minor fix.
9-
- general: cleaned tests.
13+
- general: fixed compatibility with Gmsh (version 4.12.2).
1014

1115
* Incompatible changes: In -M, changed default value of -order to 2.
1216

doc/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import sphinx_rtd_theme
1212

1313
project = u'Neper'
14-
version = u'4.8.0'
15-
release = u'4.8.0'
14+
version = u'4.8.1-1'
15+
release = u'4.8.1-1'
1616
author = u'Romain Quey'
1717
copyright = u'Romain Quey'
1818
language = 'en'

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if(POLICY CMP0077)
77
cmake_policy(SET CMP0077 NEW)
88
endif()
99

10-
set(NEPER_VERSION \"4.8.0\")
10+
set(NEPER_VERSION \"4.8.1-1\")
1111
project(neper)
1212

1313
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8.1)

src/neut/neut_mesh/neut_mesh_fscanf/neut_mesh_fscanf_msh/neut_mesh_fscanf_msh1.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ neut_mesh_fscanf_msh (FILE * file, struct NODES *pNodes, struct MESH *pMesh0D,
2626
if (ut_file_nextstring_test (file, "$MeshFormat"))
2727
neut_mesh_fscanf_msh_head (file, &mode, &domain, ptopology);
2828

29+
else if (ut_file_nextstring_test (file, "$MeshVersion"))
30+
neut_mesh_fscanf_msh_version (file, &mode, &domain, ptopology);
31+
2932
else if (ut_file_nextstring_test (file, "$Nodes"))
3033
neut_mesh_fscanf_msh_nodes (file, mode, pNodes, &node_nbs);
3134

src/neut/neut_mesh/neut_mesh_fscanf/neut_mesh_fscanf_msh/neut_mesh_fscanf_msh2.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,3 +513,22 @@ neut_mesh_fscanf_msh_nodeparts (FILE *file, struct NODES *pNodes)
513513

514514
return;
515515
}
516+
517+
void
518+
neut_mesh_fscanf_msh_version (FILE *file)
519+
{
520+
char *tmp = ut_alloc_1d_char (1000);
521+
522+
// header
523+
ut_file_skip (file, 1);
524+
525+
if (fscanf (file, "%s", tmp) != 1)
526+
abort ();
527+
528+
// footer
529+
ut_file_skip (file, 1);
530+
531+
ut_free_1d_char (&tmp);
532+
533+
return;
534+
}

0 commit comments

Comments
 (0)