"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/cgnslib.h" between
CGNS-4.1.2.tar.gz and CGNS-4.2.0.tar.gz

About: The CGNS (CFD General Notation System) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations.

cgnslib.h  (CGNS-4.1.2):cgnslib.h  (CGNS-4.2.0)
skipping to change at line 27 skipping to change at line 27
1. The origin of this software must not be misrepresented; you must not 1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be in a product, an acknowledgment in the product documentation would be
appreciated but is not required. appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not 2. Altered source versions must be plainly marked as such, and must not
be misrepresented as being the original software. be misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
* ------------------------------------------------------------------------- * _____ __ __ _____ ____ _____ _______ _ _ _______
* |_ _| \/ | __ \ / __ \| __ \__ __|/\ | \ | |__ __|
* | | | \ / | |__) | | | | |__) | | | / \ | \| | | |
* | | | |\/| | ___/| | | | _ / | | / /\ \ | . ` | | |
* _| |_| | | | | | |__| | | \ \ | |/ ____ \| |\ | | |
* |_____|_| |_|_| \____/|_| \_\ |_/_/ \_\_| \_| |_|
* *
* DEVELOPER'S NOTE: * ------------------- DEVELOPER'S NOTES ---------------------------
* When adding a defined constant to this file, also add the same defined * (1) When adding a defined constant to this file, also add the same defined
* constant to cgns_f.F90 * constant to cgns_f.F90
* *
* ------------------------------------------------------------------------- */ * ------------------------------------------------------------------------- */
#ifndef CGNSLIB_H #ifndef CGNSLIB_H
#define CGNSLIB_H #define CGNSLIB_H
#define CGNS_VERSION 4100 #define CGNS_VERSION 4200
#define CGNS_DOTVERS 4.10 #define CGNS_DOTVERS 4.20
#define CGNS_COMPATVERSION 2540 #define CGNS_COMPATVERSION 2540
#define CGNS_COMPATDOTVERS 2.54 #define CGNS_COMPATDOTVERS 2.54
#include "cgnstypes.h" #include "cgnstypes.h"
#if CG_BUILD_SCOPE #if CG_BUILD_SCOPE
# ifndef CGNS_SCOPE_ENUMS # ifndef CGNS_SCOPE_ENUMS
# define CGNS_SCOPE_ENUMS # define CGNS_SCOPE_ENUMS
# endif # endif
skipping to change at line 93 skipping to change at line 98
#define CGNS_ENUMF( e ) e #define CGNS_ENUMF( e ) e
#endif #endif
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *\ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *\
* modes for cgns file * * modes for cgns file *
\* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ \* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
#define CG_MODE_READ 0 #define CG_MODE_READ 0
#define CG_MODE_WRITE 1 #define CG_MODE_WRITE 1
#define CG_MODE_MODIFY 2 #define CG_MODE_MODIFY 2
#define CG_MODE_CLOSED 3
/* file types */ /* file types */
#define CG_FILE_NONE 0 #define CG_FILE_NONE 0
#define CG_FILE_ADF 1 #define CG_FILE_ADF 1
#define CG_FILE_HDF5 2 #define CG_FILE_HDF5 2
#define CG_FILE_ADF2 3 #define CG_FILE_ADF2 3
/* function return codes */ /* function return codes */
skipping to change at line 128 skipping to change at line 132
/* configuration options */ /* configuration options */
#define CG_CONFIG_ERROR 1 #define CG_CONFIG_ERROR 1
#define CG_CONFIG_COMPRESS 2 #define CG_CONFIG_COMPRESS 2
#define CG_CONFIG_SET_PATH 3 #define CG_CONFIG_SET_PATH 3
#define CG_CONFIG_ADD_PATH 4 #define CG_CONFIG_ADD_PATH 4
#define CG_CONFIG_FILE_TYPE 5 #define CG_CONFIG_FILE_TYPE 5
#define CG_CONFIG_RIND_INDEX 6 #define CG_CONFIG_RIND_INDEX 6
#define CG_CONFIG_HDF5_COMPRESS 201 #define CG_CONFIG_HDF5_COMPRESS 201
#define CG_CONFIG_HDF5_MPI_COMM 202 #define CG_CONFIG_HDF5_MPI_COMM 202
#define CG_CONFIG_HDF5_DISKLESS 203
#define CG_CONFIG_HDF5_DISKLESS_INCR 204
#define CG_CONFIG_HDF5_DISKLESS_WRITE 205
/* HDF5 dataset storage layout */ /* HDF5 dataset storage layout */
#define CG_CONTIGUOUS 0 #define CG_CONTIGUOUS 0
#define CG_COMPACT 1 #define CG_COMPACT 1
#define CG_CHUNKED 2 #define CG_CHUNKED 2
/* note: CG_CONFIG_RIND_ZERO is obsolete and considered a bug. Users are given /* note: CG_CONFIG_RIND_ZERO is obsolete and considered a bug. Users are given
* the option only for backwards compatibility */ * the option only for backwards compatibility */
#define CG_CONFIG_RIND_ZERO (void*)0 #define CG_CONFIG_RIND_ZERO (void*)0
skipping to change at line 476 skipping to change at line 483
* Data types: Can not add data types and stay forward compatible * * Data types: Can not add data types and stay forward compatible *
\* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ \* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
typedef enum { typedef enum {
CGNS_ENUMV( DataTypeNull ) =CG_Null, CGNS_ENUMV( DataTypeNull ) =CG_Null,
CGNS_ENUMV( DataTypeUserDefined ) =CG_UserDefined, CGNS_ENUMV( DataTypeUserDefined ) =CG_UserDefined,
CGNS_ENUMV( Integer ) =2, CGNS_ENUMV( Integer ) =2,
CGNS_ENUMV( RealSingle ) =3, CGNS_ENUMV( RealSingle ) =3,
CGNS_ENUMV( RealDouble ) =4, CGNS_ENUMV( RealDouble ) =4,
CGNS_ENUMV( Character ) =5, CGNS_ENUMV( Character ) =5,
CGNS_ENUMV( LongInteger ) =6 CGNS_ENUMV( LongInteger ) =6,
CGNS_ENUMV( ComplexSingle ) =7,
CGNS_ENUMV( ComplexDouble ) =8
} CGNS_ENUMT( DataType_t ); } CGNS_ENUMT( DataType_t );
#define NofValidDataTypes 7 #define NofValidDataTypes 9
extern CGNSDLL const char * DataTypeName[NofValidDataTypes]; extern CGNSDLL const char * DataTypeName[NofValidDataTypes];
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *\ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *\
* Element types * * Element types *
\* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ \* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
/* PLEASE ALSO UPDATE the cgnslib.h/el_size static table */ /* PLEASE ALSO UPDATE the cgnslib.h/el_size static table */
typedef enum { typedef enum {
skipping to change at line 998 skipping to change at line 1007
CGNSDLL int cg_poly_elements_read(int file_number, int B, int Z, int S, CGNSDLL int cg_poly_elements_read(int file_number, int B, int Z, int S,
cgsize_t *elements, cgsize_t *connect_offset, cgsize_t *parent_data); cgsize_t *elements, cgsize_t *connect_offset, cgsize_t *parent_data);
CGNSDLL int cg_section_write(int file_number, int B, int Z, CGNSDLL int cg_section_write(int file_number, int B, int Z,
const char * SectionName, CGNS_ENUMT(ElementType_t) type, const char * SectionName, CGNS_ENUMT(ElementType_t) type,
cgsize_t start, cgsize_t end, int nbndry, const cgsize_t * elements, cgsize_t start, cgsize_t end, int nbndry, const cgsize_t * elements,
int *S); int *S);
CGNSDLL int cg_poly_section_write(int file_number, int B, int Z, CGNSDLL int cg_poly_section_write(int file_number, int B, int Z,
const char * SectionName, CGNS_ENUMT(ElementType_t) type, const char * SectionName, CGNS_ENUMT(ElementType_t) type,
cgsize_t start, cgsize_t end, int nbndry, const cgsize_t * elements, cgsize_t start, cgsize_t end, int nbndry, const cgsize_t * elements,
const cgsize_t * connect_offset, int *S); const cgsize_t * connect_offset, int *S);
CGNSDLL int cg_section_general_write(int file_number, int B, int Z,
const char * SectionName, const CGNS_ENUMT(ElementType_t) type,
const CGNS_ENUMT(DataType_t) elementDataType, cgsize_t start,
cgsize_t end, cgsize_t elementDataSize, int nbndry, int *S);
CGNSDLL int cg_section_initialize(int file_number, int B, int Z, int S);
CGNSDLL int cg_parent_data_write(int file_number, int B, int Z, int S, CGNSDLL int cg_parent_data_write(int file_number, int B, int Z, int S,
const cgsize_t * parent_data); const cgsize_t * parent_data);
CGNSDLL int cg_npe( CGNS_ENUMT(ElementType_t) type, int *npe); CGNSDLL int cg_npe( CGNS_ENUMT(ElementType_t) type, int *npe);
CGNSDLL int cg_ElementDataSize(int file_number, int B, int Z, int S, CGNSDLL int cg_ElementDataSize(int file_number, int B, int Z, int S,
cgsize_t *ElementDataSize); cgsize_t *ElementDataSize);
CGNSDLL int cg_section_partial_write(int file_number, int B, int Z, CGNSDLL int cg_section_partial_write(int file_number, int B, int Z,
const char * SectionName, CGNS_ENUMT(ElementType_t) type, const char * SectionName, CGNS_ENUMT(ElementType_t) type,
cgsize_t start, cgsize_t end, int nbndry, int *S); cgsize_t start, cgsize_t end, int nbndry, int *S);
CGNSDLL int cg_elements_partial_write(int fn, int B, int Z, int S, CGNSDLL int cg_elements_partial_write(int fn, int B, int Z, int S,
cgsize_t start, cgsize_t end, const cgsize_t *elements); cgsize_t start, cgsize_t end, const cgsize_t *elements);
CGNSDLL int cg_elements_general_write(int fn, int B, int Z, int S,
cgsize_t start, cgsize_t end, CGNS_ENUMT(DataType_t) m_type,
const void *elements);
CGNSDLL int cg_poly_elements_partial_write(int fn, int B, int Z, int S, CGNSDLL int cg_poly_elements_partial_write(int fn, int B, int Z, int S,
cgsize_t start, cgsize_t end, const cgsize_t *elements, const cgsize_t *c onnect_offset); cgsize_t start, cgsize_t end, const cgsize_t *elements, const cgsize_t *c onnect_offset);
CGNSDLL int cg_poly_elements_general_write(int fn, int B, int Z, int S,
cgsize_t start, cgsize_t end, CGNS_ENUMT(DataType_t) m_type,
const void *elements, const void *connect_offset);
CGNSDLL int cg_parent_data_partial_write(int fn, int B, int Z, int S, CGNSDLL int cg_parent_data_partial_write(int fn, int B, int Z, int S,
cgsize_t start, cgsize_t end, const cgsize_t *ParentData); cgsize_t start, cgsize_t end, const cgsize_t *ParentData);
CGNSDLL int cg_elements_partial_read(int file_number, int B, int Z, int S, CGNSDLL int cg_elements_partial_read(int file_number, int B, int Z, int S,
cgsize_t start, cgsize_t end, cgsize_t *elements, cgsize_t *parent_data); cgsize_t start, cgsize_t end, cgsize_t *elements, cgsize_t *parent_data);
CGNSDLL int cg_poly_elements_partial_read(int file_number, int B, int Z, int S, CGNSDLL int cg_poly_elements_partial_read(int file_number, int B, int Z, int S,
cgsize_t start, cgsize_t end, cgsize_t *elements, cgsize_t *connect_offse t, cgsize_t *parent_data); cgsize_t start, cgsize_t end, cgsize_t *elements, cgsize_t *connect_offse t, cgsize_t *parent_data);
/* For reading with a datatype different from cgsize_t. Use at your own risk */
CGNSDLL int cg_elements_general_read(int file_number, int B, int Z, int S,
cgsize_t start, cgsize_t end, CGNS_ENUMT(DataType_t) m_type, void* elements)
;
CGNSDLL int cg_poly_elements_general_read(int file_number, int B, int Z, int S,
cgsize_t start, cgsize_t end, CGNS_ENUMT(DataType_t) m_type, void* elements,
void* connect_offset);
CGNSDLL int cg_parent_elements_general_read(int file_number, int B, int Z, int S
,
cgsize_t start, cgsize_t end, CGNS_ENUMT(DataType_t) m_type, void* parelem);
CGNSDLL int cg_parent_elements_position_general_read(int file_number, int B, int
Z, int S,
cgsize_t start, cgsize_t end, CGNS_ENUMT(DataType_t) m_type, void* parface);
CGNSDLL int cg_ElementPartialSize(int file_number, int B, int Z, int S, CGNSDLL int cg_ElementPartialSize(int file_number, int B, int Z, int S,
cgsize_t start, cgsize_t end, cgsize_t *ElementDataSize); cgsize_t start, cgsize_t end, cgsize_t *ElementDataSize);
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *\ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *\
* Read and write FlowSolution_t Nodes * * Read and write FlowSolution_t Nodes *
\* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ \* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
CGNSDLL int cg_nsols(int fn, int B, int Z, int *nsols); CGNSDLL int cg_nsols(int fn, int B, int Z, int *nsols);
CGNSDLL int cg_sol_info(int fn, int B, int Z, int S, char *solname, CGNSDLL int cg_sol_info(int fn, int B, int Z, int S, char *solname,
CGNS_ENUMT(GridLocation_t) *location); CGNS_ENUMT(GridLocation_t) *location);
 End of changes. 11 change blocks. 
10 lines changed or deleted 46 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)