SF.net SVN: matplotlib:[8532] trunk/toolkits/natgrid/src/nnerror.c
Revision: 8532
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8532&view=rev
Author: jswhit
Date: 2010-07-08 13:31:25 + (Thu, 08 Jul 2010)
Log Message:
---
update from ncl 5.2.0
Modified Paths:
--
trunk/toolkits/natgrid/src/nnerror.c
Modified: trunk/toolkits/natgrid/src/nnerror.c
===
--- trunk/toolkits/natgrid/src/nnerror.c2010-07-07 15:22:38 UTC (rev
8531)
+++ trunk/toolkits/natgrid/src/nnerror.c2010-07-08 13:31:25 UTC (rev
8532)
@@ -1,7 +1,20 @@
+/*
+ * $Id: nnerror.c,v 1.10 2010/04/08 05:32:30 fred Exp $
+ */
+/
+* *
+*Copyright (C) 2000*
+*University Corporation for Atmospheric Research*
+*All Rights Reserved*
+* *
+*The use of this Software is governed by a License Agreement. *
+* *
+/
+
#include
#include
-#define MAX_ERROR 31
+#define MAX_ERROR 33
void ErrorLog(int, char *, FILE *, char *);
char *ErrMsg(int);
@@ -28,6 +41,7 @@
error_status = error;
}
fprintf(efile,"%s",smsg);
+ Terminate();
}
char *ErrMsg(int i)
@@ -123,10 +137,12 @@
"Fortran DOUBLE PRECISION entries are not supported on UNICOS.",
/* #030 */
-"Error number out of range."
+"Error number out of range.",
/* #031 */
-"Weights can be returned only for linear interpolation when in \n single
point mode."
+"Weights can be returned only for linear interpolation when in \n single
point mode.",
+/* #032 */
+"Single point mode terminated without its ever having been initialized."
};
if (i >= MAX_ERROR) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[8533] trunk/toolkits/natgrid/src
Revision: 8533
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8533&view=rev
Author: jswhit
Date: 2010-07-08 14:22:11 + (Thu, 08 Jul 2010)
Log Message:
---
new files from ncl 4.2.0 version.
Added Paths:
---
trunk/toolkits/natgrid/src/ncarg/
trunk/toolkits/natgrid/src/ncarg/ngmath.h
trunk/toolkits/natgrid/src/nnculld.c
trunk/toolkits/natgrid/src/nnculls.c
Added: trunk/toolkits/natgrid/src/ncarg/ngmath.h
===
--- trunk/toolkits/natgrid/src/ncarg/ngmath.h (rev 0)
+++ trunk/toolkits/natgrid/src/ncarg/ngmath.h 2010-07-08 14:22:11 UTC (rev
8533)
@@ -0,0 +1,94 @@
+/*
+ * $Id: ngmath.h.sed,v 1.3 2008/07/27 04:02:35 haley Exp $
+ */
+/
+* *
+*Copyright (C) 2000*
+*University Corporation for Atmospheric Research*
+*All Rights Reserved*
+* *
+*The use of this Software is governed by a License Agreement. *
+* *
+/
+
+
+/*
+ * This file contains some system includes used by Ngmath functions,
+ * a source for the NGCALLF macro, the function prototypes for all
+ * user entry points in the Ngmath library, and some specific defines.
+ */
+#include
+#include
+#include
+#include
+#include
+
+/*
+ * Fortran function macro. This macro is used to provide the appropriate
+ * system-specific C function name for it to be Fortran callable.
+ */
+
+/*
+ * Function prototypes for the natgrid package.
+ */
+
+/* was duplicated in nnuhead.h */
+voidc_nnseti(char *, int);
+voidc_nngeti(char *, int *);
+voidc_nnsetr(char *, float);
+voidc_nngetr(char *, float *);
+
+/* was duplicated in nnuheads.h */
+voidc_nnsetc(char *, char *);
+voidc_nngetc(char *, char *);
+float *c_natgrids(int, float [], float [], float [],
+ int, int, float [], float [], int *);
+
+/* was duplicated in nncheads.h */
+voidc_nngetslopes(int, int, float *, int *);
+voidc_nngetaspects(int, int, float *, int *);
+voidc_nnpntinits(int, float [], float [], float []);
+voidc_nnpnts(float, float, float *);
+voidc_nnpntend();
+voidc_nngetwts(int *, int *, float *, float *, float *, float *);
+
+/* was duplicated in nnuheadd.h */
+voidc_nnsetrd(char *, double);
+voidc_nngetrd(char *, double *);
+double *c_natgridd(int, double [], double [], double [],
+ int, int, double [], double [], int *);
+
+/* was duplicated in nncheadd.h */
+voidc_nngetsloped(int, int, double *, int *);
+voidc_nngetaspectd(int, int, double *, int *);
+voidc_nnpntinitd(int, double [], double [], double []);
+voidc_nnpntd(double, double, double *);
+voidc_nnpntendd();
+voidc_nngetwtsd(int *, int *, double *, double *, double *, double *);
+
+#ifdef UNICOS
+#include
+#define NGstring_fcd
+#define NGCstrToFstr(cstr,len) ((cstr)?_cptofcd((char
*)cstr,len):_cptofcd("",0)
+)
+#define NGFstrToCstr(fstr) (_fcdtocp(fstr))
+#define NGFlgclToClgcl(flog) (_ltob(&flog))
+#define NGClgclToFlgcl(clog) (_btol(clog))
+float *c_natgrids(int, float [], float [], float [],
+float *c_natgrids(int, float [], float [], float [],
+float *c_natgrids(int, float [], float [], float [],
+float *c_natgrids(int, float [], float [], float [],
+ int, int, float [], float [], int *);
+ int, int, float [], float [], int *);
+ int, int, float [], float [], int *);
+ int, int, float [], float [], int *);
+#else
+#define NGstringchar *
+#define NGCstrToFstr(cstr,len) (char *)cstr
+#define NGFstrToCstr(fstr) fstr
+#define NGFlgclToClgcl(flog) flog
+#define NGClgclToFlgcl(clog) clog
+#endif
+
+#define NGSTRLEN(cstr) ((cstr)?strlen(cstr):0)
+
Added: trunk/toolkits/natgrid/src/nnculld.c
===
--- trunk/toolkits/natgrid/src/nnculld.c(rev 0)
+++ trunk/toolkits/natgrid/src/nnculld.c2010-07-08 14:22:11 UTC (rev
8533)
@@ -0,0 +1,124 @@
+#include
+#include
+#include
+
+extern int maxmsg;
+
+/*
+ * Comparison function for qsort to sort double precision triples.
+ */
+int comp_dtriples(const void *q1, const void *q2)
+{
+ double *p1, *p2;
+
+ p1 = (double *) q1;
+ p2 = (double *) q2;
+
+ if (p1[0] < p2[0]) {
+return (-1);
+ }
+ else if (p1[0] > p2[0]) {
+return (1);
+ }
+ else {
+if (p1[1] < p2[1]) {
+ return (-1);
+}
+el
SF.net SVN: matplotlib:[8535] trunk/toolkits/natgrid
Revision: 8535
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8535&view=rev
Author: jswhit
Date: 2010-07-08 14:23:46 + (Thu, 08 Jul 2010)
Log Message:
---
bump version number to 0.2
Modified Paths:
--
trunk/toolkits/natgrid/lib/mpl_toolkits/natgrid/__init__.py
trunk/toolkits/natgrid/setup.py
Modified: trunk/toolkits/natgrid/lib/mpl_toolkits/natgrid/__init__.py
===
--- trunk/toolkits/natgrid/lib/mpl_toolkits/natgrid/__init__.py 2010-07-08
14:22:44 UTC (rev 8534)
+++ trunk/toolkits/natgrid/lib/mpl_toolkits/natgrid/__init__.py 2010-07-08
14:23:46 UTC (rev 8535)
@@ -1,4 +1,4 @@
-__version__ = '0.1'
+__version__ = '0.2'
__doc__ = """
Python interface to NCAR natgrid library. If installed, used
by matplotlib griddata function. Not intended to be accessed directly by
users."""
Modified: trunk/toolkits/natgrid/setup.py
===
--- trunk/toolkits/natgrid/setup.py 2010-07-08 14:22:44 UTC (rev 8534)
+++ trunk/toolkits/natgrid/setup.py 2010-07-08 14:23:46 UTC (rev 8535)
@@ -6,7 +6,7 @@
extensions = [Extension("mpl_toolkits.natgrid._natgrid",deps,include_dirs =
['src'],)]
setup(
name = "natgrid",
- version = "0.1",
+ version = "0.2",
description = "Python interface to NCAR natgrid library",
url = "http://matplotlib.sourceforge.net/toolkits.html";,
download_url = "http://sourceforge.net/projects/matplotlib";,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[8536] trunk/toolkits/natgrid/Changelog
Revision: 8536 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8536&view=rev Author: jswhit Date: 2010-07-08 15:59:38 + (Thu, 08 Jul 2010) Log Message: --- update Added Paths: --- trunk/toolkits/natgrid/Changelog Added: trunk/toolkits/natgrid/Changelog === --- trunk/toolkits/natgrid/Changelog(rev 0) +++ trunk/toolkits/natgrid/Changelog2010-07-08 15:59:38 UTC (rev 8536) @@ -0,0 +1,5 @@ +version 0.2: +* updated c code from NCL 5.2.0. Now automatically removes duplicate points. +version 0.1: +* initial release. c source code from NCL 5.0.0. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
