fixes to Fortran API

This commit is contained in:
2013-09-02 09:31:14 +02:00
parent 273b1831d9
commit 7174b36a20
11 changed files with 27 additions and 8 deletions
+1
View File
@@ -6,6 +6,7 @@ LDADD =
if ENABLE_FORTRAN
LDADD += -lH5hutF
AM_LDFLAGS += -L${abs_top_builddir}/src/Fortran/.libs
endif
LDADD += -lH5hut
+4
View File
@@ -38,6 +38,7 @@ PROGRAM H5PartExampleF
CALL EXIT (1)
END IF
DO i = 1, num_args
PRINT *, "Loop..."
if (skip .EQV. .TRUE.) THEN
CYCLE
END IF
@@ -103,13 +104,16 @@ PROGRAM H5PartExampleF
IF (h5_err < 0) THEN
PRINT "('[proc ', I3, ']: Error closing file ...')", myproc
ENDIF
PRINT "('[proc ', I3, ']: File closed.')", myproc
h5_err = h5_finalize ()
IF (h5_err < 0) THEN
PRINT "('[proc ', I3, ']: Error closing H5hut library ...')", myproc
ENDIF
PRINT "('[proc ', I3, ']: H5hut finalized.')", myproc
CALL MPI_Finalize (mpi_error)
PRINT "('[proc ', I3, ']: MPI finalized.')", myproc
#else
!! SERIAL CODE
+1
View File
@@ -10,6 +10,7 @@ endif
if ENABLE_FORTRAN
LDADD += -lH5hutF
AM_LDFLAGS += -L${abs_top_builddir}/src/Fortran/.libs
endif
LDADD += -lH5hut
+4 -1
View File
@@ -1,5 +1,5 @@
/*
Copyright (c) 2006-2012, The Regents of the University of California,
Copyright (c) 2006-2013, The Regents of the University of California,
through Lawrence Berkeley National Laboratory (subject to receipt of any
required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
Institut (Switzerland). All rights reserved.
@@ -8,6 +8,9 @@
*/
#include "h5_private.h"
#include "h5core/h5.h"
#include "h5core/h5_debug.h"
#include "h5core/h5_model.h"
/* file handling interface */
+2 -1
View File
@@ -1,5 +1,5 @@
/*
Copyright (c) 2006-2012, The Regents of the University of California,
Copyright (c) 2006-2013, The Regents of the University of California,
through Lawrence Berkeley National Laboratory (subject to receipt of any
required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
Institut (Switzerland). All rights reserved.
@@ -8,6 +8,7 @@
*/
#include "h5_private.h"
#include "h5core/h5_debug.h"
#include "h5core/h5b_model.h"
#define h5bl_3d_setview F77_NAME ( \
+2 -1
View File
@@ -1,5 +1,5 @@
/*
Copyright (c) 2006-2012, The Regents of the University of California,
Copyright (c) 2006-2013, The Regents of the University of California,
through Lawrence Berkeley National Laboratory (subject to receipt of any
required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
Institut (Switzerland). All rights reserved.
@@ -8,6 +8,7 @@
*/
#include "h5_private.h"
#include "h5core/h5_debug.h"
#include "h5core/h5b_attribs.h"
#define H5_R8_T H5_FLOAT64_T
+2 -1
View File
@@ -1,5 +1,5 @@
/*
Copyright (c) 2006-2012, The Regents of the University of California,
Copyright (c) 2006-2013, The Regents of the University of California,
through Lawrence Berkeley National Laboratory (subject to receipt of any
required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
Institut (Switzerland). All rights reserved.
@@ -8,6 +8,7 @@
*/
#include "h5_private.h"
#include "h5core/h5_debug.h"
#include "h5core/h5b_io.h"
#define h5bl_3d_write_scalar_field_r8 F77_NAME ( \
+4 -1
View File
@@ -1,5 +1,5 @@
/*
Copyright (c) 2006-2012, The Regents of the University of California,
Copyright (c) 2006-2013, The Regents of the University of California,
through Lawrence Berkeley National Laboratory (subject to receipt of any
required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
Institut (Switzerland). All rights reserved.
@@ -8,8 +8,11 @@
*/
#include "h5_private.h"
#include "h5core/h5_debug.h"
#include "h5core/h5u_model.h"
#include "h5core/h5_syscall.h"
/*==============Reading Data Characteristics============*/
#define h5pt_getndatasets F77_NAME ( \
+3 -1
View File
@@ -1,5 +1,5 @@
/*
Copyright (c) 2006-2012, The Regents of the University of California,
Copyright (c) 2006-2013, The Regents of the University of California,
through Lawrence Berkeley National Laboratory (subject to receipt of any
required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
Institut (Switzerland). All rights reserved.
@@ -8,6 +8,8 @@
*/
#include "h5_private.h"
#include "h5core/h5_debug.h"
#include "h5core/h5u_io.h"
/*==================Writing data ============*/
+3 -1
View File
@@ -1,5 +1,5 @@
/*
Copyright (c) 2006-2012, The Regents of the University of California,
Copyright (c) 2006-2013, The Regents of the University of California,
through Lawrence Berkeley National Laboratory (subject to receipt of any
required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
Institut (Switzerland). All rights reserved.
@@ -8,6 +8,8 @@
*/
#include "h5_private.h"
#include "h5core/h5_debug.h"
#include "h5core/h5_attribs.h"
/*
+1 -1
View File
@@ -1,5 +1,5 @@
/*
Copyright (c) 2006-2012, The Regents of the University of California,
Copyright (c) 2006-2013, The Regents of the University of California,
through Lawrence Berkeley National Laboratory (subject to receipt of any
required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
Institut (Switzerland). All rights reserved.