Skip to content

Commit

Permalink
Fix Fortran issues: comment API scpecification to allow to pass null …
Browse files Browse the repository at this point in the history
…pointer to the function + remove the PUBLIC directory to the include dirs.
  • Loading branch information
Algiane committed Jun 20, 2022
1 parent 84b774c commit 5b7cf4e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cmake/modules/mmg3d.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ FILE(

IF( ELAS_FOUND AND NOT USE_ELAS MATCHES OFF )
# Set flags for building test program
INCLUDE_DIRECTORIES(AFTER PUBLIC ${ELAS_INCLUDE_DIR})
INCLUDE_DIRECTORIES(AFTER ${ELAS_INCLUDE_DIR})

SET(CMAKE_REQUIRED_INCLUDES ${ELAS_INCLUDE_DIR})
SET(CMAKE_REQUIRED_LIBRARIES ${ELAS_LIBRARY})
Expand Down
15 changes: 9 additions & 6 deletions src/mmg2d/libmmg2d.h
Original file line number Diff line number Diff line change
Expand Up @@ -1131,13 +1131,16 @@ extern "C" {
*
* Get vertices and references of the mesh edges.
*
* \remark Fortran interface: (commentated in order to allow to pass \%val(0)
* instead of the refs, areRidges or areRequired arrays)
*
* \remark Fortran interface:
* > SUBROUTINE MMG2D_GET_EDGES(mesh,edges,refs,areRidges,areRequired,retval)\n
* > MMG5_DATA_PTR_T,INTENT(INOUT) :: mesh\n
* > INTEGER, INTENT(IN) :: edges(*)\n
* > INTEGER, INTENT(OUT) :: refs(*),areRequired(*),areRidges(*)\n
* > INTEGER, INTENT(OUT) :: retval\n
* > END SUBROUTINE\n
* > ! SUBROUTINE MMG2D_GET_EDGES(mesh,edges,refs,areRidges,areRequired,retval)\n
* > ! MMG5_DATA_PTR_T,INTENT(INOUT) :: mesh\n
* > ! INTEGER, DIMENSION(*),INTENT(OUT) :: edges\n
* > ! INTEGER, DIMENSION(*) :: refs,areRequired,areRidges\n
* > ! INTEGER, INTENT(OUT) :: retval\n
* > ! END SUBROUTINE\n
*
*/
LIBMMG2D_EXPORT int MMG2D_Get_edges(MMG5_pMesh mesh,int *edges,int* refs,
Expand Down

0 comments on commit 5b7cf4e

Please sign in to comment.