Commit 802e066e authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Replace _vec suffix with array brackets.

parent bc86c996
...@@ -97,7 +97,7 @@ Define the UUID of an unstructured grid. ...@@ -97,7 +97,7 @@ Define the UUID of an unstructured grid.
\section*{\tt \htmlref{gridDefXbounds}{gridDefXbounds}} \section*{\tt \htmlref{gridDefXbounds}{gridDefXbounds}}
\begin{verbatim} \begin{verbatim}
void gridDefXbounds (int gridID, const double *xbounds_vec); void gridDefXbounds (int gridID, const double xbounds[]);
\end{verbatim} \end{verbatim}
Define the bounds of a X-axis. Define the bounds of a X-axis.
...@@ -142,7 +142,7 @@ Define the units of a X-axis. ...@@ -142,7 +142,7 @@ Define the units of a X-axis.
\section*{\tt \htmlref{gridDefXvals}{gridDefXvals}} \section*{\tt \htmlref{gridDefXvals}{gridDefXvals}}
\begin{verbatim} \begin{verbatim}
void gridDefXvals (int gridID, const double *xvals_vec); void gridDefXvals (int gridID, const double xvals[]);
\end{verbatim} \end{verbatim}
Define the values of a X-axis. Define the values of a X-axis.
...@@ -151,7 +151,7 @@ Define the values of a X-axis. ...@@ -151,7 +151,7 @@ Define the values of a X-axis.
\section*{\tt \htmlref{gridDefYbounds}{gridDefYbounds}} \section*{\tt \htmlref{gridDefYbounds}{gridDefYbounds}}
\begin{verbatim} \begin{verbatim}
void gridDefYbounds (int gridID, const double *ybounds_vec); void gridDefYbounds (int gridID, const double ybounds[]);
\end{verbatim} \end{verbatim}
Define the bounds of a Y-axis. Define the bounds of a Y-axis.
...@@ -196,7 +196,7 @@ Define the units of a Y-axis. ...@@ -196,7 +196,7 @@ Define the units of a Y-axis.
\section*{\tt \htmlref{gridDefYvals}{gridDefYvals}} \section*{\tt \htmlref{gridDefYvals}{gridDefYvals}}
\begin{verbatim} \begin{verbatim}
void gridDefYvals (int gridID, const double *yvals_vec); void gridDefYvals (int gridID, const double yvals[]);
\end{verbatim} \end{verbatim}
Define the values of a Y-axis. Define the values of a Y-axis.
...@@ -304,7 +304,7 @@ Get the UUID of an unstructured grid. ...@@ -304,7 +304,7 @@ Get the UUID of an unstructured grid.
\section*{\tt \htmlref{gridInqXbounds}{gridInqXbounds}} \section*{\tt \htmlref{gridInqXbounds}{gridInqXbounds}}
\begin{verbatim} \begin{verbatim}
int gridInqXbounds (int gridID, double *xbounds_vec); int gridInqXbounds (int gridID, double xbounds[]);
\end{verbatim} \end{verbatim}
Get the bounds of a X-axis. Get the bounds of a X-axis.
...@@ -367,7 +367,7 @@ Get one value of a X-axis. ...@@ -367,7 +367,7 @@ Get one value of a X-axis.
\section*{\tt \htmlref{gridInqXvals}{gridInqXvals}} \section*{\tt \htmlref{gridInqXvals}{gridInqXvals}}
\begin{verbatim} \begin{verbatim}
int gridInqXvals (int gridID, double *xvals_vec); int gridInqXvals (int gridID, double xvals[]);
\end{verbatim} \end{verbatim}
Get all values of a X-axis. Get all values of a X-axis.
...@@ -376,7 +376,7 @@ Get all values of a X-axis. ...@@ -376,7 +376,7 @@ Get all values of a X-axis.
\section*{\tt \htmlref{gridInqYbounds}{gridInqYbounds}} \section*{\tt \htmlref{gridInqYbounds}{gridInqYbounds}}
\begin{verbatim} \begin{verbatim}
int gridInqYbounds (int gridID, double *ybounds_vec); int gridInqYbounds (int gridID, double ybounds[]);
\end{verbatim} \end{verbatim}
Get the bounds of a Y-axis. Get the bounds of a Y-axis.
...@@ -439,7 +439,7 @@ Get one value of a Y-axis. ...@@ -439,7 +439,7 @@ Get one value of a Y-axis.
\section*{\tt \htmlref{gridInqYvals}{gridInqYvals}} \section*{\tt \htmlref{gridInqYvals}{gridInqYvals}}
\begin{verbatim} \begin{verbatim}
int gridInqYvals (int gridID, double *yvals_vec); int gridInqYvals (int gridID, double yvals[]);
\end{verbatim} \end{verbatim}
Get all values of a Y-axis. Get all values of a Y-axis.
...@@ -574,7 +574,7 @@ Create a new dataset. ...@@ -574,7 +574,7 @@ Create a new dataset.
\section*{\tt \htmlref{streamReadVar}{streamReadVar}} \section*{\tt \htmlref{streamReadVar}{streamReadVar}}
\begin{verbatim} \begin{verbatim}
void streamReadVar (int streamID, int varID, double *data_vec, int *nmiss); void streamReadVar (int streamID, int varID, double data[], int *nmiss);
\end{verbatim} \end{verbatim}
Read a variable. Read a variable.
...@@ -583,7 +583,7 @@ Read a variable. ...@@ -583,7 +583,7 @@ Read a variable.
\section*{\tt \htmlref{streamReadVarSlice}{streamReadVarSlice}} \section*{\tt \htmlref{streamReadVarSlice}{streamReadVarSlice}}
\begin{verbatim} \begin{verbatim}
void streamReadVarSlice (int streamID, int varID, int levelID, double *data_vec, void streamReadVarSlice (int streamID, int varID, int levelID, double data[],
int *nmiss); int *nmiss);
\end{verbatim} \end{verbatim}
...@@ -602,7 +602,7 @@ Synchronize an Open Dataset to Disk. ...@@ -602,7 +602,7 @@ Synchronize an Open Dataset to Disk.
\section*{\tt \htmlref{streamWriteVar}{streamWriteVar}} \section*{\tt \htmlref{streamWriteVar}{streamWriteVar}}
\begin{verbatim} \begin{verbatim}
void streamWriteVar (int streamID, int varID, const double *data_vec, int nmiss); void streamWriteVar (int streamID, int varID, const double data[], int nmiss);
\end{verbatim} \end{verbatim}
Write a variable. Write a variable.
...@@ -612,7 +612,7 @@ Write a variable. ...@@ -612,7 +612,7 @@ Write a variable.
\begin{verbatim} \begin{verbatim}
void streamWriteVarSlice (int streamID, int varID, int levelID, void streamWriteVarSlice (int streamID, int varID, int levelID,
const double *data_vec, int nmiss); const double data[], int nmiss);
\end{verbatim} \end{verbatim}
Write a horizontal slice of a variable. Write a horizontal slice of a variable.
...@@ -856,7 +856,7 @@ Create a variable list. ...@@ -856,7 +856,7 @@ Create a variable list.
\begin{verbatim} \begin{verbatim}
int vlistDefAttFlt (int vlistID, int varID, const char *name, int type, int len, int vlistDefAttFlt (int vlistID, int varID, const char *name, int type, int len,
const double *dp_vec); const double dp[]);
\end{verbatim} \end{verbatim}
Define a floating point attribute. Define a floating point attribute.
...@@ -866,7 +866,7 @@ Define a floating point attribute. ...@@ -866,7 +866,7 @@ Define a floating point attribute.
\begin{verbatim} \begin{verbatim}
int vlistDefAttInt (int vlistID, int varID, const char *name, int type, int len, int vlistDefAttInt (int vlistID, int varID, const char *name, int type, int len,
const int *ip_vec); const int ip[]);
\end{verbatim} \end{verbatim}
Define an integer attribute. Define an integer attribute.
...@@ -1050,7 +1050,7 @@ Get information about an attribute. ...@@ -1050,7 +1050,7 @@ Get information about an attribute.
\begin{verbatim} \begin{verbatim}
int vlistInqAttFlt (int vlistID, int varID, const char *name, int mlen, int vlistInqAttFlt (int vlistID, int varID, const char *name, int mlen,
double *dp_vec); double dp[]);
\end{verbatim} \end{verbatim}
Get the value(s) of a floating point attribute. Get the value(s) of a floating point attribute.
...@@ -1059,8 +1059,7 @@ Get the value(s) of a floating point attribute. ...@@ -1059,8 +1059,7 @@ Get the value(s) of a floating point attribute.
\section*{\tt \htmlref{vlistInqAttInt}{vlistInqAttInt}} \section*{\tt \htmlref{vlistInqAttInt}{vlistInqAttInt}}
\begin{verbatim} \begin{verbatim}
int vlistInqAttInt (int vlistID, int varID, const char *name, int mlen, int vlistInqAttInt (int vlistID, int varID, const char *name, int mlen, int ip[]);
int *ip_vec);
\end{verbatim} \end{verbatim}
Get the value(s) of an integer attribute. Get the value(s) of an integer attribute.
...@@ -1277,7 +1276,7 @@ Define one level of a Z-axis. ...@@ -1277,7 +1276,7 @@ Define one level of a Z-axis.
\section*{\tt \htmlref{zaxisDefLevels}{zaxisDefLevels}} \section*{\tt \htmlref{zaxisDefLevels}{zaxisDefLevels}}
\begin{verbatim} \begin{verbatim}
void zaxisDefLevels (int zaxisID, const double *levels_vec); void zaxisDefLevels (int zaxisID, const double levels[]);
\end{verbatim} \end{verbatim}
Define the levels of a Z-axis. Define the levels of a Z-axis.
...@@ -1367,7 +1366,7 @@ Get one level of a Z-axis. ...@@ -1367,7 +1366,7 @@ Get one level of a Z-axis.
\section*{\tt \htmlref{zaxisInqLevels}{zaxisInqLevels}} \section*{\tt \htmlref{zaxisInqLevels}{zaxisInqLevels}}
\begin{verbatim} \begin{verbatim}
void zaxisInqLevels (int zaxisID, double *levels_vec); void zaxisInqLevels (int zaxisID, double levels[]);
\end{verbatim} \end{verbatim}
Get all levels of a Z-axis. Get all levels of a Z-axis.
......
...@@ -97,7 +97,7 @@ Define the UUID of an unstructured grid. ...@@ -97,7 +97,7 @@ Define the UUID of an unstructured grid.
\section*{\tt \htmlref{gridDefXbounds}{gridDefXbounds}} \section*{\tt \htmlref{gridDefXbounds}{gridDefXbounds}}
\begin{verbatim} \begin{verbatim}
SUBROUTINE gridDefXbounds (INTEGER gridID, DOUBLEPRECISION xbounds_vec) SUBROUTINE gridDefXbounds (INTEGER gridID, DOUBLEPRECISION xbounds)
\end{verbatim} \end{verbatim}
Define the bounds of a X-axis. Define the bounds of a X-axis.
...@@ -142,7 +142,7 @@ Define the units of a X-axis. ...@@ -142,7 +142,7 @@ Define the units of a X-axis.
\section*{\tt \htmlref{gridDefXvals}{gridDefXvals}} \section*{\tt \htmlref{gridDefXvals}{gridDefXvals}}
\begin{verbatim} \begin{verbatim}
SUBROUTINE gridDefXvals (INTEGER gridID, DOUBLEPRECISION xvals_vec) SUBROUTINE gridDefXvals (INTEGER gridID, DOUBLEPRECISION xvals)
\end{verbatim} \end{verbatim}
Define the values of a X-axis. Define the values of a X-axis.
...@@ -151,7 +151,7 @@ Define the values of a X-axis. ...@@ -151,7 +151,7 @@ Define the values of a X-axis.
\section*{\tt \htmlref{gridDefYbounds}{gridDefYbounds}} \section*{\tt \htmlref{gridDefYbounds}{gridDefYbounds}}
\begin{verbatim} \begin{verbatim}
SUBROUTINE gridDefYbounds (INTEGER gridID, DOUBLEPRECISION ybounds_vec) SUBROUTINE gridDefYbounds (INTEGER gridID, DOUBLEPRECISION ybounds)
\end{verbatim} \end{verbatim}
Define the bounds of a Y-axis. Define the bounds of a Y-axis.
...@@ -196,7 +196,7 @@ Define the units of a Y-axis. ...@@ -196,7 +196,7 @@ Define the units of a Y-axis.
\section*{\tt \htmlref{gridDefYvals}{gridDefYvals}} \section*{\tt \htmlref{gridDefYvals}{gridDefYvals}}
\begin{verbatim} \begin{verbatim}
SUBROUTINE gridDefYvals (INTEGER gridID, DOUBLEPRECISION yvals_vec) SUBROUTINE gridDefYvals (INTEGER gridID, DOUBLEPRECISION yvals)
\end{verbatim} \end{verbatim}
Define the values of a Y-axis. Define the values of a Y-axis.
...@@ -304,7 +304,7 @@ Get the UUID of an unstructured grid. ...@@ -304,7 +304,7 @@ Get the UUID of an unstructured grid.
\section*{\tt \htmlref{gridInqXbounds}{gridInqXbounds}} \section*{\tt \htmlref{gridInqXbounds}{gridInqXbounds}}
\begin{verbatim} \begin{verbatim}
INTEGER FUNCTION gridInqXbounds (INTEGER gridID, DOUBLEPRECISION xbounds_vec) INTEGER FUNCTION gridInqXbounds (INTEGER gridID, DOUBLEPRECISION xbounds)
\end{verbatim} \end{verbatim}
Get the bounds of a X-axis. Get the bounds of a X-axis.
...@@ -367,7 +367,7 @@ Get one value of a X-axis. ...@@ -367,7 +367,7 @@ Get one value of a X-axis.
\section*{\tt \htmlref{gridInqXvals}{gridInqXvals}} \section*{\tt \htmlref{gridInqXvals}{gridInqXvals}}
\begin{verbatim} \begin{verbatim}
INTEGER FUNCTION gridInqXvals (INTEGER gridID, DOUBLEPRECISION xvals_vec) INTEGER FUNCTION gridInqXvals (INTEGER gridID, DOUBLEPRECISION xvals)
\end{verbatim} \end{verbatim}
Get all values of a X-axis. Get all values of a X-axis.
...@@ -376,7 +376,7 @@ Get all values of a X-axis. ...@@ -376,7 +376,7 @@ Get all values of a X-axis.
\section*{\tt \htmlref{gridInqYbounds}{gridInqYbounds}} \section*{\tt \htmlref{gridInqYbounds}{gridInqYbounds}}
\begin{verbatim} \begin{verbatim}
INTEGER FUNCTION gridInqYbounds (INTEGER gridID, DOUBLEPRECISION ybounds_vec) INTEGER FUNCTION gridInqYbounds (INTEGER gridID, DOUBLEPRECISION ybounds)
\end{verbatim} \end{verbatim}
Get the bounds of a Y-axis. Get the bounds of a Y-axis.
...@@ -439,7 +439,7 @@ Get one value of a Y-axis. ...@@ -439,7 +439,7 @@ Get one value of a Y-axis.
\section*{\tt \htmlref{gridInqYvals}{gridInqYvals}} \section*{\tt \htmlref{gridInqYvals}{gridInqYvals}}
\begin{verbatim} \begin{verbatim}
INTEGER FUNCTION gridInqYvals (INTEGER gridID, DOUBLEPRECISION yvals_vec) INTEGER FUNCTION gridInqYvals (INTEGER gridID, DOUBLEPRECISION yvals)
\end{verbatim} \end{verbatim}
Get all values of a Y-axis. Get all values of a Y-axis.
...@@ -574,8 +574,8 @@ Create a new dataset. ...@@ -574,8 +574,8 @@ Create a new dataset.
\section*{\tt \htmlref{streamReadVar}{streamReadVar}} \section*{\tt \htmlref{streamReadVar}{streamReadVar}}
\begin{verbatim} \begin{verbatim}
SUBROUTINE streamReadVar (INTEGER streamID, INTEGER varID, SUBROUTINE streamReadVar (INTEGER streamID, INTEGER varID, DOUBLEPRECISION data,
DOUBLEPRECISION data_vec, INTEGER nmiss) INTEGER nmiss)
\end{verbatim} \end{verbatim}
Read a variable. Read a variable.
...@@ -585,7 +585,7 @@ Read a variable. ...@@ -585,7 +585,7 @@ Read a variable.
\begin{verbatim} \begin{verbatim}
SUBROUTINE streamReadVarSlice (INTEGER streamID, INTEGER varID, INTEGER levelID, SUBROUTINE streamReadVarSlice (INTEGER streamID, INTEGER varID, INTEGER levelID,
DOUBLEPRECISION data_vec, INTEGER nmiss) DOUBLEPRECISION data, INTEGER nmiss)
\end{verbatim} \end{verbatim}
Read a horizontal slice of a variable. Read a horizontal slice of a variable.
...@@ -603,8 +603,8 @@ Synchronize an Open Dataset to Disk. ...@@ -603,8 +603,8 @@ Synchronize an Open Dataset to Disk.
\section*{\tt \htmlref{streamWriteVar}{streamWriteVar}} \section*{\tt \htmlref{streamWriteVar}{streamWriteVar}}
\begin{verbatim} \begin{verbatim}
SUBROUTINE streamWriteVar (INTEGER streamID, INTEGER varID, SUBROUTINE streamWriteVar (INTEGER streamID, INTEGER varID, DOUBLEPRECISION data,
DOUBLEPRECISION data_vec, INTEGER nmiss) INTEGER nmiss)
\end{verbatim} \end{verbatim}
Write a variable. Write a variable.
...@@ -614,7 +614,7 @@ Write a variable. ...@@ -614,7 +614,7 @@ Write a variable.
\begin{verbatim} \begin{verbatim}
SUBROUTINE streamWriteVarSlice (INTEGER streamID, INTEGER varID, INTEGER levelID, SUBROUTINE streamWriteVarSlice (INTEGER streamID, INTEGER varID, INTEGER levelID,
DOUBLEPRECISION data_vec, INTEGER nmiss) DOUBLEPRECISION data, INTEGER nmiss)
\end{verbatim} \end{verbatim}
Write a horizontal slice of a variable. Write a horizontal slice of a variable.
...@@ -860,7 +860,7 @@ Create a variable list. ...@@ -860,7 +860,7 @@ Create a variable list.
\begin{verbatim} \begin{verbatim}
INTEGER FUNCTION vlistDefAttFlt (INTEGER vlistID, INTEGER varID, INTEGER FUNCTION vlistDefAttFlt (INTEGER vlistID, INTEGER varID,
CHARACTER*(*) name, INTEGER type, INTEGER len, CHARACTER*(*) name, INTEGER type, INTEGER len,
DOUBLEPRECISION dp_vec) DOUBLEPRECISION dp)
\end{verbatim} \end{verbatim}
Define a floating point attribute. Define a floating point attribute.
...@@ -871,7 +871,7 @@ Define a floating point attribute. ...@@ -871,7 +871,7 @@ Define a floating point attribute.
\begin{verbatim} \begin{verbatim}
INTEGER FUNCTION vlistDefAttInt (INTEGER vlistID, INTEGER varID, INTEGER FUNCTION vlistDefAttInt (INTEGER vlistID, INTEGER varID,
CHARACTER*(*) name, INTEGER type, INTEGER len, CHARACTER*(*) name, INTEGER type, INTEGER len,
INTEGER ip_vec) INTEGER ip)
\end{verbatim} \end{verbatim}
Define an integer attribute. Define an integer attribute.
...@@ -1065,7 +1065,7 @@ Get information about an attribute. ...@@ -1065,7 +1065,7 @@ Get information about an attribute.
\begin{verbatim} \begin{verbatim}
INTEGER FUNCTION vlistInqAttFlt (INTEGER vlistID, INTEGER varID, INTEGER FUNCTION vlistInqAttFlt (INTEGER vlistID, INTEGER varID,
CHARACTER*(*) name, INTEGER mlen, CHARACTER*(*) name, INTEGER mlen,
DOUBLEPRECISION dp_vec) DOUBLEPRECISION dp)
\end{verbatim} \end{verbatim}
Get the value(s) of a floating point attribute. Get the value(s) of a floating point attribute.
...@@ -1075,8 +1075,7 @@ Get the value(s) of a floating point attribute. ...@@ -1075,8 +1075,7 @@ Get the value(s) of a floating point attribute.
\begin{verbatim} \begin{verbatim}
INTEGER FUNCTION vlistInqAttInt (INTEGER vlistID, INTEGER varID, INTEGER FUNCTION vlistInqAttInt (INTEGER vlistID, INTEGER varID,
CHARACTER*(*) name, INTEGER mlen, CHARACTER*(*) name, INTEGER mlen, INTEGER ip)
INTEGER ip_vec)
\end{verbatim} \end{verbatim}
Get the value(s) of an integer attribute. Get the value(s) of an integer attribute.
...@@ -1299,7 +1298,7 @@ Define one level of a Z-axis. ...@@ -1299,7 +1298,7 @@ Define one level of a Z-axis.
\section*{\tt \htmlref{zaxisDefLevels}{zaxisDefLevels}} \section*{\tt \htmlref{zaxisDefLevels}{zaxisDefLevels}}
\begin{verbatim} \begin{verbatim}
SUBROUTINE zaxisDefLevels (INTEGER zaxisID, DOUBLEPRECISION levels_vec) SUBROUTINE zaxisDefLevels (INTEGER zaxisID, DOUBLEPRECISION levels)
\end{verbatim} \end{verbatim}
Define the levels of a Z-axis. Define the levels of a Z-axis.
...@@ -1389,7 +1388,7 @@ Get one level of a Z-axis. ...@@ -1389,7 +1388,7 @@ Get one level of a Z-axis.
\section*{\tt \htmlref{zaxisInqLevels}{zaxisInqLevels}} \section*{\tt \htmlref{zaxisInqLevels}{zaxisInqLevels}}
\begin{verbatim} \begin{verbatim}
SUBROUTINE zaxisInqLevels (INTEGER zaxisID, DOUBLEPRECISION levels_vec) SUBROUTINE zaxisInqLevels (INTEGER zaxisID, DOUBLEPRECISION levels)
\end{verbatim} \end{verbatim}
Get all levels of a Z-axis. Get all levels of a Z-axis.
......
...@@ -150,7 +150,7 @@ $argumentTemplates = ...@@ -150,7 +150,7 @@ $argumentTemplates =
#these templates must precede the more general templates for pointer arguments. #these templates must precede the more general templates for pointer arguments.
#That way, we can override the more general template with the more special one if both match. #That way, we can override the more general template with the more special one if both match.
{ #<integerTypes>* <name>_vec { #<integerTypes>* <name>_vec
:regex => '^\s*(?<type><integerTypes>)\s*\*\s*(?<name>\w+_vec)\s*$', :regex => '^\s*(?<type><integerTypes>)\s*(?:\*\s*(?<name>\w+_vec)|(?<name>\w+)\[\])\s*$',
:placeholders => %w[name type], :placeholders => %w[name type],
:dummyName => '<name>_dummy', :dummyName => '<name>_dummy',
:acceptAs => 'integer(c_<type>), intent(inout) :: <name>_dummy(*)', :acceptAs => 'integer(c_<type>), intent(inout) :: <name>_dummy(*)',
...@@ -160,7 +160,7 @@ $argumentTemplates = ...@@ -160,7 +160,7 @@ $argumentTemplates =
:passAs => 'integer(c_<type>), intent(inout) :: <name>_dummy(*)', :passAs => 'integer(c_<type>), intent(inout) :: <name>_dummy(*)',
:postcallStatements => "" :postcallStatements => ""
}, { #<floatTypes>* <name>_vec }, { #<floatTypes>* <name>_vec
:regex => '^\s*(?<type><floatTypes>)\s*\*\s*(?<name>\w+_vec)\s*$', :regex => '^\s*(?<type><floatTypes>)\s*(?:\*\s*(?<name>\w+_vec)|(?<name>\w+)\[\])\s*$',
:placeholders => %w[name type], :placeholders => %w[name type],
:dummyName => '<name>_dummy', :dummyName => '<name>_dummy',
:acceptAs => 'real(c_<type>), intent(inout) :: <name>_dummy(*)', :acceptAs => 'real(c_<type>), intent(inout) :: <name>_dummy(*)',
...@@ -180,7 +180,7 @@ $argumentTemplates = ...@@ -180,7 +180,7 @@ $argumentTemplates =
:passAs => 'integer(kind = c_signed_char), intent(inout) :: <name>_dummy(<size>)', :passAs => 'integer(kind = c_signed_char), intent(inout) :: <name>_dummy(<size>)',
:postcallStatements => "" :postcallStatements => ""
}, { #const <integerTypes>* <name>_vec }, { #const <integerTypes>* <name>_vec
:regex => '^\s*const\s+(?<type><integerTypes>)\s*\*\s*(?<name>\w+_vec)\s*$', :regex => '^\s*const\s+(?<type><integerTypes>)\s*(?:\*\s*(?<name>\w+_vec)|(?<name>\w+)\[\])\s*$',
:placeholders => %w[name type], :placeholders => %w[name type],
:dummyName => '<name>_dummy', :dummyName => '<name>_dummy',
:acceptAs => 'integer(c_<type>), intent(in) :: <name>_dummy(*)', :acceptAs => 'integer(c_<type>), intent(in) :: <name>_dummy(*)',
...@@ -190,7 +190,7 @@ $argumentTemplates = ...@@ -190,7 +190,7 @@ $argumentTemplates =
:passAs => 'integer(c_<type>), intent(in) :: <name>_dummy(*)', :passAs => 'integer(c_<type>), intent(in) :: <name>_dummy(*)',
:postcallStatements => "" :postcallStatements => ""
}, { #const <floatTypes>* <name>_vec }, { #const <floatTypes>* <name>_vec
:regex => '^\s*const\s+(?<type><floatTypes>)\s*\*\s*(?<name>\w+_vec)\s*$', :regex => '^\s*const\s+(?<type><floatTypes>)\s*(?:\*\s*(?<name>\w+_vec)|(?<name>\w+)\[\])\s*$',
:placeholders => %w[name type], :placeholders => %w[name type],
:dummyName => '<name>_dummy', :dummyName => '<name>_dummy',
:acceptAs => 'real(c_<type>), intent(in) :: <name>_dummy(*)', :acceptAs => 'real(c_<type>), intent(in) :: <name>_dummy(*)',
......
...@@ -359,31 +359,31 @@ int streamInqNvars ( int streamID ); ...@@ -359,31 +359,31 @@ int streamInqNvars ( int streamID );
/* STREAM var I/O routines */ /* STREAM var I/O routines */
/* streamWriteVar: Write a variable */ /* streamWriteVar: Write a variable */
void streamWriteVar(int streamID, int varID, const double *data_vec, int nmiss); void streamWriteVar(int streamID, int varID, const double data[], int nmiss);
void streamWriteVarF(int streamID, int varID, const float *data_vec, int nmiss); void streamWriteVarF(int streamID, int varID, const float data[], int nmiss);
/* streamReadVar: Read a variable */ /* streamReadVar: Read a variable */
void streamReadVar(int streamID, int varID, double *data_vec, int *nmiss); void streamReadVar(int streamID, int varID, double data[], int *nmiss);
void streamReadVarF(int streamID, int varID, float *data_vec, int *nmiss); void streamReadVarF(int streamID, int varID, float data[], int *nmiss);
/* streamWriteVarSlice: Write a horizontal slice of a variable */ /* streamWriteVarSlice: Write a horizontal slice of a variable */
void streamWriteVarSlice(int streamID, int varID, int levelID, const double *data_vec, int nmiss); void streamWriteVarSlice(int streamID, int varID, int levelID, const double data[], int nmiss);
void streamWriteVarSliceF(int streamID, int varID, int levelID, const float *data_vec, int nmiss); void streamWriteVarSliceF(int streamID, int varID, int levelID, const float data[], int nmiss);
/* streamReadVarSlice: Read a horizontal slice of a variable */ /* streamReadVarSlice: Read a horizontal slice of a variable */
void streamReadVarSlice(int streamID, int varID, int levelID, double *data_vec, int *nmiss); void streamReadVarSlice(int streamID, int varID, int levelID, double data[], int *nmiss);
void streamReadVarSliceF(int streamID, int varID, int levelID, float *data_vec, int *nmiss); void streamReadVarSliceF(int streamID, int varID, int levelID, float data[], int *nmiss);
void streamWriteVarChunk(int streamID, int varID, const int rect[3][2], const double *data_vec, int nmiss); void streamWriteVarChunk(int streamID, int varID, const int rect[3][2], const double data[], int nmiss);
/* STREAM record I/O routines */ /* STREAM record I/O routines */
void streamDefRecord(int streamID, int varID, int levelID); void streamDefRecord(int streamID, int varID, int levelID);
void streamInqRecord(int streamID, int *varID, int *levelID); void streamInqRecord(int streamID, int *varID, int *levelID);
void streamWriteRecord(int streamID, const double *data_vec, int nmiss); void streamWriteRecord(int streamID, const double data[], int nmiss);
void streamWriteRecordF(int streamID, const float *data_vec, int nmiss); void streamWriteRecordF(int streamID, const float data[], int nmiss);
void streamReadRecord(int streamID, double *data_vec, int *nmiss); void streamReadRecord(int streamID, double data[], int *nmiss);
void streamCopyRecord(int streamIDdest, int streamIDsrc); void streamCopyRecord(int streamIDdest, int streamIDsrc);
void streamInqGRIBinfo(int streamID, int *intnum, float *fltnum, off_t *bignum); void streamInqGRIBinfo(int streamID, int *intnum, float *fltnum, off_t *bignum);
...@@ -417,8 +417,8 @@ char *cdiIterator_inqVariableName(CdiIterator *me); //The caller is respo ...@@ -417,8 +417,8 @@ char *cdiIterator_inqVariableName(CdiIterator *me); //The caller is respo
int cdiIterator_inqGridId(CdiIterator *me); //The returned id is only valid until the next call to cdiIteratorNextField(). int cdiIterator_inqGridId(CdiIterator *me); //The returned id is only valid until the next call to cdiIteratorNextField().
//Reading data //Reading data
void cdiIterator_readField(CdiIterator *me, double *data_vec, size_t *nmiss_optional); void cdiIterator_readField(CdiIterator *me, double data[], size_t *nmiss_optional);
void cdiIterator_readFieldF(CdiIterator *me, float *data_vec, size_t *nmiss_optional); void cdiIterator_readFieldF(CdiIterator *me, float data[], size_t *nmiss_optional);
//TODO[NH]: Add functions to read partial fields. //TODO[NH]: Add functions to read partial fields.
...@@ -670,16 +670,16 @@ int vlistInqAtt(int vlistID, int varID, int attrnum, char *name, int *typep, ...@@ -670,16 +670,16 @@ int vlistInqAtt(int vlistID, int varID, int attrnum, char *name, int *typep,
int vlistDelAtt(int vlistID, int varID, const char *name); int vlistDelAtt(int vlistID, int varID, const char *name);
/* vlistDefAttInt: Define an integer attribute */ /* vlistDefAttInt: Define an integer attribute */
int vlistDefAttInt(int vlistID, int varID, const char *name, int type, int len, const int *ip_vec); int vlistDefAttInt(int vlistID, int varID, const char *name, int type, int len, const int ip[]);
/* vlistDefAttFlt: Define a floating point attribute */ /* vlistDefAttFlt: Define a floating point attribute */
int vlistDefAttFlt(int vlistID, int varID, const char *name, int type, int len, const double *dp_vec); int vlistDefAttFlt(int vlistID, int varID, const char *name, int type, int len, const double dp[]);
/* vlistDefAttTxt: Define a text attribute */ /* vlistDefAttTxt: Define a text attribute */
int vlistDefAttTxt(int vlistID, int varID, const char *name, int len, const char *tp_cbuf); int vlistDefAttTxt(int vlistID, int varID, const char *name, int len, const char *tp_cbuf);
/* vlistInqAttInt: Get the value(s) of an integer attribute */ /* vlistInqAttInt: Get the value(s) of an integer attribute */
int vlistInqAttInt(int vlistID, int varID, const char *name, int mlen, int *ip_vec); int vlistInqAttInt(int vlistID, int varID, const char *name, int mlen, int ip[]);
/* vlistInqAttFlt: Get the value(s) of a floating point attribute */ /* vlistInqAttFlt: Get the value(s) of a floating point attribute */
int vlistInqAttFlt(int vlistID, int varID, const char *name, int mlen, double *dp_vec); int vlistInqAttFlt(int vlistID, int varID, const char *name, int mlen, double dp[]);
/* vlistInqAttTxt: Get the value(s) of a text attribute */ /* vlistInqAttTxt: Get the value(s) of a text attribute */
int vlistInqAttTxt(int vlistID, int varID, const char *name, int mlen, char *tp_cbuf); int vlistInqAttTxt(int vlistID, int varID, const char *name, int mlen, char *tp_cbuf);