From e2820e4d8a758cc32e66b2a11b29a4a4b6702ee5 Mon Sep 17 00:00:00 2001 From: tbeu Date: Thu, 20 Aug 2015 11:42:05 +0200 Subject: [PATCH] Fix common typos Detected by https://github.com/vlajos/misspell_fixer --- CMakeLists.txt | 6 ++--- Doxyfile.developer | 2 +- RELEASE_NOTES.md | 6 ++--- docs/Doxyfile.in | 2 +- docs/OPeNDAP.dox | 2 +- docs/file_format_specifications.md | 4 ++-- docs/internal.dox | 2 +- docs/old/netcdf-c.texi | 2 +- docs/old/netcdf-cxx4.texi | 2 +- docs/old/netcdf-f77.texi | 6 ++--- docs/old/netcdf-f90.texi | 6 ++--- docs/old/netcdf-install.texi | 4 ++-- docs/old/netcdf-internal.texi | 16 +++++++------- docs/old/netcdf.texi | 10 ++++----- docs/software.md | 4 ++-- docs/tutorial.dox | 2 +- docs/types.dox | 2 +- dods.m4 | 2 +- examples/C/quick_large_files.c | 2 +- include/nc3internal.h | 2 +- include/nc4internal.h | 2 +- include/utf8proc.h | 2 +- libdap2/dceconstraints.c | 4 ++-- libdispatch/dcopy.c | 2 +- libdispatch/ddim.c | 2 +- libdispatch/ddispatch.c | 2 +- libdispatch/dfile.c | 2 +- libdispatch/dutf8proc.c | 4 ++-- libdispatch/dv2i.c | 2 +- libdispatch/ncuri.c | 2 +- libsrc/ffio.c | 8 +++---- libsrc/lookup3.c | 6 ++--- libsrc/nc3internal.c | 2 +- libsrc/ncx.c | 2 +- libsrc/ncx.h | 6 ++--- libsrc/ncx.m4 | 4 ++-- libsrc/posixio.c | 8 +++---- libsrc/pstdint.h | 2 +- libsrc/putget.c | 2 +- libsrc/putget.m4 | 2 +- libsrc4/nc4dim.c | 2 +- libsrc4/nc4file.c | 4 ++-- libsrc4/nc4hdf.c | 2 +- nc_test/nc_sync.c | 2 +- nc_test/quick_large_files.c | 22 +++++++++---------- nc_test/test_put.c | 16 +++++++------- nc_test/test_put.m4 | 2 +- nc_test/tst_atts3.c | 2 +- nc_test4/bm_file.c | 4 ++-- nc_test4/run_bm.sh | 2 +- nc_test4/tst_atts1.c | 2 +- nc_test4/tst_camrun.c | 20 ++++++++--------- nc_test4/tst_large3.c | 2 +- nc_test4/tst_vars2.c | 8 +++---- nc_test4/tst_vars3.c | 2 +- ncdap_test/expected3/in.nc.dmp | 2 +- ncdap_test/expected3/in1.nc.dmp | 2 +- ncdap_test/expected3/in_2.nc.dmp | 2 +- .../expected3/in_no_three_double_dmn.nc.dmp | 2 +- ncdap_test/testdata3/in.nc.das | 2 +- ncdap_test/testdata3/in1.nc.das | 2 +- ncdap_test/testdata3/in_2.nc.das | 2 +- .../testdata3/in_no_three_double_dmn.nc.das | 2 +- ncdump/chunkspec.c | 2 +- ncdump/ncdump.c | 2 +- ncdump/nctime0.c | 2 +- ncdump/vardata.c | 2 +- ncgen/ConvertUTF.h | 2 +- ncgen/escapes.c | 2 +- ncgen/genchar.c | 4 ++-- ncgen/ref_camrun.cdl | 20 ++++++++--------- ncgen/semantics.c | 2 +- ncgen3/escapes.c | 2 +- ncgen3/genlib.c | 2 +- nctest/atttests.c | 2 +- oc2/ocuri.c | 2 +- 76 files changed, 152 insertions(+), 152 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e47ebe59d..83c3cb839 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -225,7 +225,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC OR APPLE) ADD_DEFINITIONS() -# Supress CRT Warnings. +# Suppress CRT Warnings. # Only necessary for Windows IF(MSVC) ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) @@ -458,7 +458,7 @@ OPTION(USE_HDF5 "Use HDF5." ${ENABLE_NETCDF_4}) IF(USE_HDF5 OR ENABLE_NETCDF_4) SET(USE_HDF5 ON) SET(USE_NETCDF4 ON) - # Accomodate developers who have hdf5 libraries and + # Accommodate developers who have hdf5 libraries and # headers on their system, but do not have a the hdf # .cmake files. If this is the case, they should # specify HDF5_HL_LIB, HDF5_LIB, HDF5_INCLUDE_DIR manually. @@ -652,7 +652,7 @@ ENDIF() # Check to see if libtool supports -# Check for the math library so it can be explicitely linked. +# Check for the math library so it can be explicitly linked. IF(NOT WIN32) FIND_LIBRARY(HAVE_LIBM NAMES math m libm) MESSAGE(STATUS "Found Math library: ${HAVE_LIBM}") diff --git a/Doxyfile.developer b/Doxyfile.developer index 47dfef865..2b9c8e086 100755 --- a/Doxyfile.developer +++ b/Doxyfile.developer @@ -2008,7 +2008,7 @@ PREDEFINED = EXPAND_AS_DEFINED = # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will -# remove all refrences to function-like macros that are alone on a line, have an +# remove all references to function-like macros that are alone on a line, have an # all uppercase name, and do not end with a semicolon. Such function macros are # typically used for boiler-plate code, and will confuse the parser if not # removed. diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index a5ff91658..8c2e8796a 100755 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -351,7 +351,7 @@ This is a bug-fix-only release for version 4.3.1. ### 4.3.1-rc1 Released 2013-08-09 -* Migrated from the netCDF-C `subversion` repository to a publically available GitHub repository available at https://github.com/Unidata/netCDF-C. This repository may be checked out (cloned) with the following command: +* Migrated from the netCDF-C `subversion` repository to a publicly available GitHub repository available at https://github.com/Unidata/netCDF-C. This repository may be checked out (cloned) with the following command: $ git clone https://github.com/Unidata/netCDF-C.git @@ -392,7 +392,7 @@ This is a bug-fix-only release for version 4.3.1. ## 4.3.0 Released 2013-04-29 * fsync: Changed default in autotools config file; fsync must now be -explicitely enabled instead of explicitely disabled. [NCF-239] +explicitly enabled instead of explicitly disabled. [NCF-239] [NCF-239]: https://bugtracking.unidata.ucar.edu/browse/NCF-239 @@ -1111,7 +1111,7 @@ Kent. * Fixed some cross-compile problems. * Rewrote code which placed bogus errors on the HDF5 error stack, trying -to open non-existant attributes and variables. Now no HDF5 errors are +to open non-existent attributes and variables. Now no HDF5 errors are seen. * Removed man subdirectory. Now man4 subdirectory is used for all builds. diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in index e54366399..4a06da34b 100644 --- a/docs/Doxyfile.in +++ b/docs/Doxyfile.in @@ -2019,7 +2019,7 @@ PREDEFINED = USE_NETCDF4 EXPAND_AS_DEFINED = # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will -# remove all refrences to function-like macros that are alone on a line, have an +# remove all references to function-like macros that are alone on a line, have an # all uppercase name, and do not end with a semicolon. Such function macros are # typically used for boiler-plate code, and will confuse the parser if not # removed. diff --git a/docs/OPeNDAP.dox b/docs/OPeNDAP.dox index deee826d1..520cf24f0 100644 --- a/docs/OPeNDAP.dox +++ b/docs/OPeNDAP.dox @@ -488,7 +488,7 @@ assumed that the cost is not prohibitive. In an effort to provide better performance for some access patterns, client-side caching of data is available. The default is no caching, -but it may be enabled by prefixing the URL with the paramter "cache". +but it may be enabled by prefixing the URL with the parameter "cache". Caching operates basically as follows. diff --git a/docs/file_format_specifications.md b/docs/file_format_specifications.md index 972e7575e..b00dd0c14 100644 --- a/docs/file_format_specifications.md +++ b/docs/file_format_specifications.md @@ -477,7 +477,7 @@ sets these when creating a group. Each dataset in the HDF5 file must be created with a property list for which the attribute creation order has been set to creation -ordering. The H5Pset_attr_creation_order funtion is used to set the +ordering. The H5Pset_attr_creation_order function is used to set the creation ordering of attributes of a variable. The following example code (from libsrc4/nc4hdf.c) shows how the @@ -511,7 +511,7 @@ Until version 1.8, HDF5 did not have any capability to represent shared dimensions. With the 1.8 release, HDF5 introduced the dimension scale feature to allow shared dimensions in HDF5 files. -The dimension scale is unfortunately not exactly equivilent to the +The dimension scale is unfortunately not exactly equivalent to the netCDF shared dimension, and this leads to a number of compromises in the design of netCDF-4. diff --git a/docs/internal.dox b/docs/internal.dox index 3721b1ac3..0eda133ce 100644 --- a/docs/internal.dox +++ b/docs/internal.dox @@ -132,7 +132,7 @@ adding something like the following. \section dispatch_step7 Step 7. -Modify the NC_intialize function in liblib/stub.c by adding +Modify the NC_initialize function in liblib/stub.c by adding appropriate references to the NCM dispatch function. \code diff --git a/docs/old/netcdf-c.texi b/docs/old/netcdf-c.texi index f8e42c539..29d23c3a2 100644 --- a/docs/old/netcdf-c.texi +++ b/docs/old/netcdf-c.texi @@ -1354,7 +1354,7 @@ initial size for the file. ... int status; int ncid; -int intialsz = 2048; +int initialsz = 2048; int *bufrsize; ... *bufrsize = 1024; diff --git a/docs/old/netcdf-cxx4.texi b/docs/old/netcdf-cxx4.texi index f40952882..c5382a489 100755 --- a/docs/old/netcdf-cxx4.texi +++ b/docs/old/netcdf-cxx4.texi @@ -147,7 +147,7 @@ attributes are discussed. @node Class Hierarchy, Auxiliary Types and Constants, Introduction, Introduction @unnumberedsec Class Hierarchy -@cindex class hierachy +@cindex class hierarchy The class for netCDF file objects is @code{NcFile}. diff --git a/docs/old/netcdf-f77.texi b/docs/old/netcdf-f77.texi index 8b4a685ea..7d57b950d 100644 --- a/docs/old/netcdf-f77.texi +++ b/docs/old/netcdf-f77.texi @@ -2218,7 +2218,7 @@ group. Variable are only visible in the group in which they are defined. The same applies to attributes. ``Global'' attributes are defined in -whichever group is refered to by the ncid. +whichever group is referred to by the ncid. Dimensions are visible in their groups, and all child groups. @@ -3775,7 +3775,7 @@ Insert a named field into a compound type. @heading Usage @example -INTEGER FUNTION NF_INSERT_COMPOUND(INTEGER TYPEID, CHARACTER*(*) NAME, INTEGER OFFSET, +INTEGER FUNCTION NF_INSERT_COMPOUND(INTEGER TYPEID, CHARACTER*(*) NAME, INTEGER OFFSET, INTEGER FIELD_TYPEID) @end example @@ -3959,7 +3959,7 @@ C Include an array. Get the number of fields, length in bytes, and name of a compound type. -In addtion to the NF_INQ_COMPOUND function, three additional functions +In addition to the NF_INQ_COMPOUND function, three additional functions are provided which get only the name, size, and number of fields. @heading Usage diff --git a/docs/old/netcdf-f90.texi b/docs/old/netcdf-f90.texi index dc10b4ada..335132da4 100755 --- a/docs/old/netcdf-f90.texi +++ b/docs/old/netcdf-f90.texi @@ -1731,7 +1731,7 @@ group. Variable are only visible in the group in which they are defined. The same applies to attributes. ``Global'' attributes are defined in -whichever group is refered to by the ncid. +whichever group is referred to by the ncid. Dimensions are visible in their groups, and all child groups. @@ -3334,7 +3334,7 @@ Wyoming. Fortran users may use character buffers to read and write compound types. User are invited to try classic Fortran features such as the -equivilence and the common block statment. +equivilence and the common block statement. @heading Usage @@ -3590,7 +3590,7 @@ must do so before the compound type is committed. Get the number of fields, length in bytes, and name of a compound type. -In addtion to the NF90_INQ_COMPOUND function, three additional functions +In addition to the NF90_INQ_COMPOUND function, three additional functions are provided which get only the name, size, and number of fields. @heading Usage diff --git a/docs/old/netcdf-install.texi b/docs/old/netcdf-install.texi index 7ce175ab7..7f3dcccfe 100755 --- a/docs/old/netcdf-install.texi +++ b/docs/old/netcdf-install.texi @@ -650,7 +650,7 @@ in which case this flag should be disabled. @item --enable-dap-long-tests If --enable-dap-remote-tests is enabled, then this flag can also be enabled to add extra tests that may -take signficant time to execute. +take significant time to execute. This flag is off by default. @item --enable-hdf4 @@ -760,7 +760,7 @@ Change the size (in bytes) that will be used as a target size when computing default chunksizes for netCDF-4/HDF5 chunked variables. @item --default-chunks-in-cache -Change the number of chunks that are accomodated in the per-variable +Change the number of chunks that are accommodated in the per-variable chunk caches that are used by default. @item --max-default-cache-size diff --git a/docs/old/netcdf-internal.texi b/docs/old/netcdf-internal.texi index be80f6a4f..f40f0d31a 100755 --- a/docs/old/netcdf-internal.texi +++ b/docs/old/netcdf-internal.texi @@ -51,7 +51,7 @@ netcdf-f90, The NetCDF Users' Guide for FORTRAN 90}). @menu * C Code:: -* Derivitive Works:: +* Derivative Works:: * Concept Index:: @detailmenu @@ -71,7 +71,7 @@ C Code @end detailmenu @end menu -@node C Code, Derivitive Works, Top, Top +@node C Code, Derivative Works, Top, Top @chapter C Code The netCDF library is implemented in C in a bunch of directories under @@ -533,11 +533,11 @@ package involving cfortran.h, which defines a C function of the exact signature which will be produced by a fortran program calling a C function. So _nf_open will map to nc_open. -@node Derivitive Works, Concept Index, C Code, Top -@chapter Derivitive Works +@node Derivative Works, Concept Index, C Code, Top +@chapter Derivative Works -At Unidata, the creative energies are simply enourmous. NetCDF has -spawned a host of derivitive works, some samples of which are listed +At Unidata, the creative energies are simply enormous. NetCDF has +spawned a host of derivative works, some samples of which are listed below. @section From ``A Tale of Two Data Formats,'' the bestselling novel @@ -654,7 +654,7 @@ it doesn't mean that I can't love you, you know? [Audience]: (sighing) Ahhhhhh... -[Jerry]: Now we have a suprise guest, flow all the way here from +[Jerry]: Now we have a surprise guest, flow all the way here from Champagne-Urbana, Illinois, to appear as a guest on this show. Her name is HDF5, and she's a professional data format. @@ -671,7 +671,7 @@ someone gets hurt... @end example -@node Concept Index, , Derivitive Works, Top +@node Concept Index, , Derivative Works, Top @chapter Concept Index @printindex cp diff --git a/docs/old/netcdf.texi b/docs/old/netcdf.texi index 4ff2e81f3..40d610638 100644 --- a/docs/old/netcdf.texi +++ b/docs/old/netcdf.texi @@ -1851,7 +1851,7 @@ write variables and attributes of any type. Use these functions to read and write variables and attributes of user defined type. In C use nc_put_att/nc_get_att and the nc_put_var/nc_get_var, nc_put_var1/nc_get_var1, nc_put_vara/nc_get_vara, or -nc_put_vars/nc_get_vars functons to access attribute and variable data +nc_put_vars/nc_get_vars functions to access attribute and variable data of user defined type. @subsection Compound Types @@ -3237,7 +3237,7 @@ The DAS output from the web server should look like this. @verbatim Attributes { Facility { - String PrincipleInvestigator ``Mark Abbott'', ``Ph.D''; + String PrincipleInvestigator ``Mark Abort'', ``Ph.D''; String DataCenter ``COAS Environmental Computer Facility''; String DrifterType ``MetOcean WOCE/OCM''; } @@ -5979,7 +5979,7 @@ sets these when creating a group. Each dataset in the HDF5 file must be created with a property list for which the attribute creation order has been set to creation -ordering. The H5Pset_attr_creation_order funtion is used to set the +ordering. The H5Pset_attr_creation_order function is used to set the creation ordering of attributes of a variable. The following example code (from libsrc4/nc4hdf.c) shows how the @@ -6014,7 +6014,7 @@ Until version 1.8, HDF5 did not have any capability to represent shared dimensions. With the 1.8 release, HDF5 introduced the dimension scale feature to allow shared dimensions in HDF5 files. -The dimension scale is unfortunately not exactly equivilent to the +The dimension scale is unfortunately not exactly equivalent to the netCDF shared dimension, and this leads to a number of compromises in the design of netCDF-4. @@ -6416,7 +6416,7 @@ endif @end example @unnumberedsec Step 7. -Modify the NC_intialize function in liblib/stub.c by +Modify the NC_initialize function in liblib/stub.c by adding appropriate references to the NCM dispatch function. @example #ifdef USE_NETCDFM diff --git a/docs/software.md b/docs/software.md index 5777b31ff..ca3c4c732 100644 --- a/docs/software.md +++ b/docs/software.md @@ -173,7 +173,7 @@ categories. - Missing values (setctomiss, setmisstoc, setrtomiss) - Arithmetic (add, sub, mul, div, ...) - Mathematical functions (sqrt, exp, log, sin, cos, ...) -- Comparision (eq, ne, le, lt, ge, gt, ...) +- Comparison (eq, ne, le, lt, ge, gt, ...) - Conditions (ifthen, ifnotthen, ifthenc, ifnotthenc) - Field statistics (fldsum, fldavg, fldstd, fldmin, fldmax, ...) - Vertical statistics (vertsum, vertavg, vertstd, vertmin, ...) @@ -1857,7 +1857,7 @@ from a given file, URL, stream, or NetcdfFile object. SIS netCDF storage is intended to be a bridge between NetCDF Climate and Forecast (CF) conventions and ISO 19115 metadata. -SIS is under developement as an Apache project. Release 0.3 is currently +SIS is under development as an Apache project. Release 0.3 is currently available for download. Tcl/Tk interfaces {#TclTk} diff --git a/docs/tutorial.dox b/docs/tutorial.dox index 8ad85681b..4b3adf6f7 100644 --- a/docs/tutorial.dox +++ b/docs/tutorial.dox @@ -7,7 +7,7 @@ \section sec_tut Tutorial Documentation -This page contains refrences to various other NetCDF background and tutorial pages. +This page contains references to various other NetCDF background and tutorial pages. \subsection tutorial_pages Tutorial Pages diff --git a/docs/types.dox b/docs/types.dox index 699e1b33b..ae5fb44b9 100644 --- a/docs/types.dox +++ b/docs/types.dox @@ -167,7 +167,7 @@ defining variables or attributes. Use functions - nc_put_vara() / nc_get_vara() - nc_put_vars() / nc_get_vars() -functons to access attribute and variable data of user defined type. +functions to access attribute and variable data of user defined type. \subsection types_compound_types Compound Types diff --git a/dods.m4 b/dods.m4 index c79b069b3..87a025bfc 100644 --- a/dods.m4 +++ b/dods.m4 @@ -509,7 +509,7 @@ AC_DEFUN([DODS_CHECK_SIZES], [dnl # there are 2 possibilities for the definition of dods_int32, ..., # types. First possibility is that the C99 types are used and # dods-datatypes-static.h is copied. In that case the following - # definitions are not really usefull. In case the C99 types are + # definitions are not really useful. In case the C99 types are # not available, dods-datatypes-config.h.in is used to generate # dods-datatypes.h. # The code below makes dods-datatypes-config.h stand on its own. diff --git a/examples/C/quick_large_files.c b/examples/C/quick_large_files.c index 294179e97..4ba7a5b39 100644 --- a/examples/C/quick_large_files.c +++ b/examples/C/quick_large_files.c @@ -1,7 +1,7 @@ /* This example program is part of Unidata's netCDF library for scientific data access. - This program (quickly, but not throughly) tests the large file + This program (quickly, but not thoroughly) tests the large file features. Ed Hartnett, 8/11/4 diff --git a/include/nc3internal.h b/include/nc3internal.h index deb78a451..1e4dabc90 100644 --- a/include/nc3internal.h +++ b/include/nc3internal.h @@ -58,7 +58,7 @@ typedef enum { /* - * NC dimension stucture + * NC dimension structure */ typedef struct { /* all xdr'd */ diff --git a/include/nc4internal.h b/include/nc4internal.h index 2f1fad90d..7f4e969e1 100644 --- a/include/nc4internal.h +++ b/include/nc4internal.h @@ -315,7 +315,7 @@ typedef struct NC_HDF5_FILE_INFO } NC_HDF5_FILE_INFO_T; -/* These functions convert beteen netcdf and HDF5 types. */ +/* These functions convert between netcdf and HDF5 types. */ int nc4_get_typelen_mem(NC_HDF5_FILE_INFO_T *h5, nc_type xtype, int is_long, size_t *len); int nc4_convert_type(const void *src, void *dest, diff --git a/include/utf8proc.h b/include/utf8proc.h index 1ab94c4f7..9d9bf82ec 100644 --- a/include/utf8proc.h +++ b/include/utf8proc.h @@ -114,7 +114,7 @@ typedef unsigned char _Bool; * Flags being regarded by several functions in the library: * NULLTERM: The given UTF-8 input is NULL terminated. * STABLE: Unicode Versioning Stability has to be respected. - * COMPAT: Compatiblity decomposition + * COMPAT: Compatibility decomposition * (i.e. formatting information is lost) * COMPOSE: Return a result with composed characters. * DECOMPOSE: Return a result with decomposed characters. diff --git a/libdap2/dceconstraints.c b/libdap2/dceconstraints.c index 0aba56d64..67428e6fb 100644 --- a/libdap2/dceconstraints.c +++ b/libdap2/dceconstraints.c @@ -196,7 +196,7 @@ dceslicecompose(DCEslice* s1, DCEslice* s2, DCEslice* result) { int err = NC_NOERR; size_t lastx = 0; - DCEslice sr; /* For back compatability so s1 and result can be same object */ + DCEslice sr; /* For back compatibility so s1 and result can be same object */ #ifdef DEBUG1 slicedump("compose: s1",s1); slicedump("compose: s2",s2); @@ -997,7 +997,7 @@ dcesegmentsize(DCEsegment* seg, size_t start, size_t stop) } /* Return the index of the leftmost slice - starting at start and upto, but not including + starting at start and up to, but not including stop, such that it and all slices to the right are "safe". Safe means dceiswholeslice() is true. In effect, we can read the safe index set as a diff --git a/libdispatch/dcopy.c b/libdispatch/dcopy.c index f0a202ff5..ed91caeca 100644 --- a/libdispatch/dcopy.c +++ b/libdispatch/dcopy.c @@ -643,7 +643,7 @@ nc_copy_att(int ncid_in, int varid_in, const char *name, } } else - return retval; /* Some other error occured. */ + return retval; /* Some other error occurred. */ } else return NC_copy_att(ncid_in, varid_in, name, ncid_out, varid_out); diff --git a/libdispatch/ddim.c b/libdispatch/ddim.c index c7916645a..b66e87650 100644 --- a/libdispatch/ddim.c +++ b/libdispatch/ddim.c @@ -284,7 +284,7 @@ nc_rename_dim(int ncid, int dimid, const char *name) /*! Find the number of dimensions. -In a classic model netCDF file, this funtion returns the number of +In a classic model netCDF file, this function returns the number of defined dimensions. In a netCDF-4/HDF5 file, this function returns the number of dimensions available in the group specified by ncid, which may be less than the total number of dimensions in a file. In a diff --git a/libdispatch/ddispatch.c b/libdispatch/ddispatch.c index 6d7b3469f..7d07ea7b8 100644 --- a/libdispatch/ddispatch.c +++ b/libdispatch/ddispatch.c @@ -3,7 +3,7 @@ #define MAXSERVERURL 4096 -extern int NCSUBSTRATE_intialize(void); +extern int NCSUBSTRATE_initialize(void); /* Define vectors of zeros and ones for use with various nc_get_varX function*/ size_t nc_sizevector0[NC_MAX_VAR_DIMS]; diff --git a/libdispatch/dfile.c b/libdispatch/dfile.c index 1516224d7..f47de0d1a 100644 --- a/libdispatch/dfile.c +++ b/libdispatch/dfile.c @@ -459,7 +459,7 @@ and initial size for the file. ... int status = NC_NOERR; int ncid; - int intialsz = 2048; + int initialsz = 2048; int *bufrsize; ... *bufrsize = 1024; diff --git a/libdispatch/dutf8proc.c b/libdispatch/dutf8proc.c index c9edff0f3..f1e68a5a6 100644 --- a/libdispatch/dutf8proc.c +++ b/libdispatch/dutf8proc.c @@ -109,7 +109,7 @@ const char *utf8proc_errmsg(ssize_t errcode) { case UTF8PROC_ERROR_INVALIDOPTS: return "Invalid options for UTF-8 processing chosen."; default: - return "An unknown error occured while processing UTF-8 data."; + return "An unknown error occurred while processing UTF-8 data."; } } @@ -367,7 +367,7 @@ ssize_t utf8proc_decompose( while (1) { if (options & UTF8PROC_NULLTERM) { rpos += utf8proc_iterate(str + rpos, -1, &uc); - /* checking of return value is not neccessary, + /* checking of return value is not necessary, as 'uc' is < 0 in case of error. */ if (uc < 0) return UTF8PROC_ERROR_INVALIDUTF8; if (rpos < 0) return UTF8PROC_ERROR_OVERFLOW; diff --git a/libdispatch/dv2i.c b/libdispatch/dv2i.c index 48e83d992..7cbcd2eb8 100644 --- a/libdispatch/dv2i.c +++ b/libdispatch/dv2i.c @@ -1,5 +1,5 @@ /** \file -The V2 API Funtions. +The V2 API Functions. Copyright 1996, University Corporation for Atmospheric Research See \ref copyright file for copying and redistribution conditions. diff --git a/libdispatch/ncuri.c b/libdispatch/ncuri.c index 5858e5e4b..9d29685a3 100644 --- a/libdispatch/ncuri.c +++ b/libdispatch/ncuri.c @@ -592,7 +592,7 @@ than once, then the first occurrence is used; this is so that is possible to forcibly override user specified parameters by prefixing. IMPORTANT: client parameter string is assumed to have blanks compressed out. Returns 1 if parse -suceeded, 0 otherwise; */ +succeeded, 0 otherwise; */ int ncuridecodeparams(NCURI* ncuri) diff --git a/libsrc/ffio.c b/libsrc/ffio.c index 551640c85..75dd03f58 100644 --- a/libsrc/ffio.c +++ b/libsrc/ffio.c @@ -525,7 +525,7 @@ ncio_ffio_new(const char *path, int ioflags) /* put all the FFIO assign specific code here * returns a pointer to an internal static char location * which may change when the function is called again - * if the returned pointer is NULL this indicates that an error occured + * if the returned pointer is NULL this indicates that an error occurred * check errno for the netCDF error value */ /* prototype fortran subroutines */ @@ -565,7 +565,7 @@ ncio_ffio_assign(const char *filename) { #endif if (istat == 0) { /* user has already specified an assign */ return buffer; - } else if (istat > 0 || istat < -1) { /* error occured */ + } else if (istat > 0 || istat < -1) { /* error occurred */ errno = EINVAL; return (const char *) NULL; } /* istat = -1 -> no assign for file */ @@ -635,7 +635,7 @@ ffio_create(const char *path, int ioflags, return ENOMEM; if ((ControlString = ncio_ffio_assign(path)) == (const char *)NULL) { - /* an error occured - just punt */ + /* an error occurred - just punt */ status = errno; goto unwind_new; } @@ -728,7 +728,7 @@ ffio_open(const char *path, return ENOMEM; if ((ControlString = ncio_ffio_assign(path)) == (const char *)NULL) { - /* an error occured - just punt */ + /* an error occurred - just punt */ status = errno; goto unwind_new; } diff --git a/libsrc/lookup3.c b/libsrc/lookup3.c index 415dbb688..b970567a0 100644 --- a/libsrc/lookup3.c +++ b/libsrc/lookup3.c @@ -309,7 +309,7 @@ hashlittle2( * rest of the string. Every machine with memory protection I've seen * does it on word boundaries, so is OK with this. But VALGRIND will * still catch it and complain. The masking trick does make the hash - * noticably faster for short strings (like English words). + * noticeably faster for short strings (like English words). */ #ifndef VALGRIND @@ -488,7 +488,7 @@ hashbig( const void *key, size_t length, uint32_t initval) * rest of the string. Every machine with memory protection I've seen * does it on word boundaries, so is OK with this. But VALGRIND will * still catch it and complain. The masking trick does make the hash - * noticably faster for short strings (like English words). + * noticeably faster for short strings (like English words). */ #ifndef VALGRIND @@ -639,7 +639,7 @@ hashlittle( const void *key, size_t length, uint32_t initval) * rest of the string. Every machine with memory protection I've seen * does it on word boundaries, so is OK with this. But VALGRIND will * still catch it and complain. The masking trick does make the hash - * noticably faster for short strings (like English words). + * noticeably faster for short strings (like English words). */ #ifndef VALGRIND diff --git a/libsrc/nc3internal.c b/libsrc/nc3internal.c index d563f564f..052910a0d 100644 --- a/libsrc/nc3internal.c +++ b/libsrc/nc3internal.c @@ -1474,7 +1474,7 @@ NC3_set_base_pe(int ncid, int pe) /* update serving & lock values for a "smooth" transition */ /* note that the "real" server will being doing this as well */ /* as all the rest in the group */ - /* must have syncronization before & after this step */ + /* must have synchronization before & after this step */ shmem_short_get( (shmem_t *) nc3->lock + LOCKNUMREC_SERVING, (shmem_t *) nc3->lock + LOCKNUMREC_SERVING, diff --git a/libsrc/ncx.c b/libsrc/ncx.c index 31f53f904..48bba3c67 100644 --- a/libsrc/ncx.c +++ b/libsrc/ncx.c @@ -1198,7 +1198,7 @@ put_ix_float(void *xp, const float *ip) /* * Return the number of bytes until the next "word" boundary - * N.B. This is based on the very wierd YMP address structure, + * N.B. This is based on the very weird YMP address structure, * which puts the address within a word in the leftmost 3 bits * of the address. */ diff --git a/libsrc/ncx.h b/libsrc/ncx.h index 746df5f2b..72dd6e69a 100644 --- a/libsrc/ncx.h +++ b/libsrc/ncx.h @@ -43,7 +43,7 @@ /* * The integer return code for the conversion routines - * is 0 (ENOERR) when no error occured, or NC_ERANGE as appropriate + * is 0 (ENOERR) when no error occurred, or NC_ERANGE as appropriate * for an overflow conversion. */ #ifndef ENOERR @@ -192,10 +192,10 @@ typedef signed char schar; * * Storage for a single element of internal type is at `ip' argument. * - * These functions return 0 (ENOERR) when no error occured, + * These functions return 0 (ENOERR) when no error occurred, * or NC_ERANGE when the value being converted is too large. * When NC_ERANGE occurs, an undefined (implementation dependent) - * conversion may have occured. + * conversion may have occurred. * * Note that loss of precision may occur silently. * diff --git a/libsrc/ncx.m4 b/libsrc/ncx.m4 index 71668e452..61b18995c 100644 --- a/libsrc/ncx.m4 +++ b/libsrc/ncx.m4 @@ -1,7 +1,7 @@ dnl dnl sjl: this version of ncx.m4 has SX-specific optimisations as per dnl Harveys mods to earlier versions. However, I have removed -dnl support for FLOAT2 and attemped to tidy up the mods to +dnl support for FLOAT2 and attempted to tidy up the mods to dnl reduce the complexity a bit dnl dnl This is m4 source. @@ -1130,7 +1130,7 @@ PUT_VAX_DFLOAT_Body(xp) /* * Return the number of bytes until the next "word" boundary - * N.B. This is based on the very wierd YMP address structure, + * N.B. This is based on the very weird YMP address structure, * which puts the address within a word in the leftmost 3 bits * of the address. */ diff --git a/libsrc/posixio.c b/libsrc/posixio.c index cf24ad64e..479e71dbc 100644 --- a/libsrc/posixio.c +++ b/libsrc/posixio.c @@ -387,7 +387,7 @@ typedef struct ncio_px { offset - file offset for beginning of to region to be released. - rflags - only RGN_MODIFIED is relevent to this function, others ignored + rflags - only RGN_MODIFIED is relevant to this function, others ignored */ static int px_rel(ncio_px *const pxp, off_t offset, int rflags) @@ -420,7 +420,7 @@ px_rel(ncio_px *const pxp, off_t offset, int rflags) nciop - pointer to ncio struct. offset - num bytes from beginning of buffer to region to be released. - rflags - only RGN_MODIFIED is relevent to this function, others ignored + rflags - only RGN_MODIFIED is relevant to this function, others ignored */ static int ncio_px_rel(ncio *const nciop, off_t offset, int rflags) @@ -444,7 +444,7 @@ ncio_px_rel(ncio *const nciop, off_t offset, int rflags) offset - start byte of region to get. extent - how many bytes to read. rflags - One of the RGN_* flags defined in ncio.h. - vpp - pointer to pointer that will recieve data. + vpp - pointer to pointer that will receive data. NOTES: @@ -1517,7 +1517,7 @@ ncio_px_new(const char *path, int ioflags) #define NC_DEFAULT_CREAT_MODE 0666 #endif -/* Create a file, and the ncio struct to go with it. This funtion is +/* Create a file, and the ncio struct to go with it. This function is only called from nc__create_mp. path - path of file to create. diff --git a/libsrc/pstdint.h b/libsrc/pstdint.h index 6a334bae9..c5b0ed5ee 100644 --- a/libsrc/pstdint.h +++ b/libsrc/pstdint.h @@ -73,7 +73,7 @@ * include stdint.h. The hope is that one or the other can be * used with no real difference. * - * 5) In the current verison, if your platform can't represent + * 5) In the current version, if your platform can't represent * int32_t, int16_t and int8_t, it just dumps out with a compiler * error. * diff --git a/libsrc/putget.c b/libsrc/putget.c index da4de4d5d..0554da278 100644 --- a/libsrc/putget.c +++ b/libsrc/putget.c @@ -609,7 +609,7 @@ NCtouchlast(NC3_INFO* ncp, const NC_var *const *varpp, size_t recno) /* * Ensure that the netcdf file has 'numrecs' records, - * add records and fill as neccessary. + * add records and fill as necessary. */ static int NCvnrecs(NC3_INFO* ncp, size_t numrecs) diff --git a/libsrc/putget.m4 b/libsrc/putget.m4 index fc4e3ee34..8459c2086 100644 --- a/libsrc/putget.m4 +++ b/libsrc/putget.m4 @@ -374,7 +374,7 @@ NCtouchlast(NC3_INFO* ncp, const NC_var *const *varpp, size_t recno) /* * Ensure that the netcdf file has 'numrecs' records, - * add records and fill as neccessary. + * add records and fill as necessary. */ static int NCvnrecs(NC3_INFO* ncp, size_t numrecs) diff --git a/libsrc4/nc4dim.c b/libsrc4/nc4dim.c index c5fc3d640..111392bcf 100644 --- a/libsrc4/nc4dim.c +++ b/libsrc4/nc4dim.c @@ -191,7 +191,7 @@ NC4_inq_dimid(int ncid, const char *name, int *idp) } /* Find out name and len of a dim. For an unlimited dimension, the - length is the largest lenght so far written. If the name of lenp + length is the largest length so far written. If the name of lenp pointers are NULL, they will be ignored. */ int NC4_inq_dim(int ncid, int dimid, char *name, size_t *lenp) diff --git a/libsrc4/nc4file.c b/libsrc4/nc4file.c index 5976237f2..72f00b27b 100644 --- a/libsrc4/nc4file.c +++ b/libsrc4/nc4file.c @@ -2978,7 +2978,7 @@ sync_netcdf4_file(NC_HDF5_FILE_INFO_T *h5) /* Turn define mode off. */ h5->flags ^= NC_INDEF; - /* Redef mode needs to be tracked seperately for nc_abort. */ + /* Redef mode needs to be tracked separately for nc_abort. */ h5->redef = NC_FALSE; } @@ -3309,7 +3309,7 @@ nc4_enddef_netcdf4_file(NC_HDF5_FILE_INFO_T *h5) /* Turn define mode off. */ h5->flags ^= NC_INDEF; - /* Redef mode needs to be tracked seperately for nc_abort. */ + /* Redef mode needs to be tracked separately for nc_abort. */ h5->redef = NC_FALSE; return sync_netcdf4_file(h5); diff --git a/libsrc4/nc4hdf.c b/libsrc4/nc4hdf.c index 81de2b471..64701442b 100644 --- a/libsrc4/nc4hdf.c +++ b/libsrc4/nc4hdf.c @@ -751,7 +751,7 @@ nc4_put_vara(NC *nc, int ncid, int varid, const size_t *startp, /* Reach consensus about dimension sizes to extend to */ /* (Note: Somewhat hackish, with the use of MPI_INTEGER, but MPI_MAX is * correct with this usage, as long as it's not executed on - * heterogenous systems) + * heterogeneous systems) */ if(MPI_SUCCESS != MPI_Allreduce(MPI_IN_PLACE, &xtend_size, (var->ndims * (sizeof(hsize_t) / sizeof(int))), MPI_UNSIGNED, MPI_MAX, h5->comm)) BAIL(NC_EMPI); diff --git a/nc_test/nc_sync.c b/nc_test/nc_sync.c index 8395927c9..e24bd0580 100644 --- a/nc_test/nc_sync.c +++ b/nc_test/nc_sync.c @@ -120,7 +120,7 @@ nc_sync_sub(int ncid) pid = wait(&status); } - } /* successfull popen() */ + } /* successful popen() */ return everythingOK ? 0 : 1; } diff --git a/nc_test/quick_large_files.c b/nc_test/quick_large_files.c index 14e58bfee..5be7246a3 100644 --- a/nc_test/quick_large_files.c +++ b/nc_test/quick_large_files.c @@ -2,7 +2,7 @@ Copyright 2004-2006, UCAR/Unidata See COPYRIGHT file for copying and redistribution conditions. - This program (quickly, but not throughly) tests the large file + This program (quickly, but not thoroughly) tests the large file features. It turns off fill mode to quickly create an 8 gb file, and write one value is written, nothing is read. @@ -105,7 +105,7 @@ main(int argc, char **argv) This has 3 dims, 4 vars. The dimensions are such that this will (just barely) not fit in a classic format file. The first three vars are cromwell, 536870911 bytes, washington, 2*536870911 - bytes, and napolean, 536870911 bytes. That's a grand total of + bytes, and napoleon, 536870911 bytes. That's a grand total of 2147483644 bytes. Recall our magic limit for the combined size of all fixed vars: 2 GiB - 4 bytes, or 2147483644. So you would think these would exactly fit, unless you realized that @@ -137,7 +137,7 @@ main(int argc, char **argv) if ((res = nc_def_var(ncid, "Washington", NC_SHORT, 1, &dimids_gen[1], &washingtonid))) ERR; - if ((res = nc_def_var(ncid, "Napolean", NC_BYTE, 1, &dimids_gen[0], + if ((res = nc_def_var(ncid, "Napoleon", NC_BYTE, 1, &dimids_gen[0], &napoleanid))) ERR; if ((res = nc_def_var(ncid, "Collins", NC_DOUBLE, 1, &dimids_gen[2], @@ -206,7 +206,7 @@ main(int argc, char **argv) if ((res = nc_def_var(ncid, "Washington", NC_SHORT, 1, &dimids_gen[1], &washingtonid))) ERR; - if ((res = nc_def_var(ncid, "Napolean", NC_BYTE, 1, &dimids_gen[0], + if ((res = nc_def_var(ncid, "Napoleon", NC_BYTE, 1, &dimids_gen[0], &napoleanid))) ERR; if ((res = nc_def_var(ncid, "Collins", NC_DOUBLE, 1, &dimids_gen[2], @@ -230,7 +230,7 @@ main(int argc, char **argv) if ((res = nc_def_var(ncid, "Cromwell", NC_SHORT, 1, dimids_gen, &cromwellid))) ERR; - if ((res = nc_def_var(ncid, "Napolean", NC_SHORT, 1, dimids_gen, + if ((res = nc_def_var(ncid, "Napoleon", NC_SHORT, 1, dimids_gen, &napoleanid))) ERR; if ((res = nc_def_var(ncid, "Collins", NC_DOUBLE, 1, dimids_gen, @@ -289,7 +289,7 @@ main(int argc, char **argv) if ((res = nc_def_var(ncid, "Washington", NC_SHORT, 2, dimids_gen, &washingtonid))) ERR; - if ((res = nc_def_var(ncid, "Napolean", NC_BYTE, 2, dimids_gen, + if ((res = nc_def_var(ncid, "Napoleon", NC_BYTE, 2, dimids_gen, &napoleanid))) ERR; if ((res = nc_def_var(ncid, "Collins", NC_DOUBLE, 1, &dimids_gen[2], @@ -325,7 +325,7 @@ main(int argc, char **argv) if ((res = nc_def_var(ncid, "Washington", NC_SHORT, 2, dimids_gen, &washingtonid))) ERR; - if ((res = nc_def_var(ncid, "Napolean", NC_BYTE, 2, dimids_gen, + if ((res = nc_def_var(ncid, "Napoleon", NC_BYTE, 2, dimids_gen, &napoleanid))) ERR; if ((res = nc_def_var(ncid, "Collins", NC_DOUBLE, 1, &dimids_gen[2], @@ -422,7 +422,7 @@ main(int argc, char **argv) if ((res = nc_def_var(ncid, "Washington", NC_SHORT, 2, dimids_gen1, &washingtonid))) ERR; - if ((res = nc_def_var(ncid, "Napolean", NC_BYTE, 2, dimids_gen1, + if ((res = nc_def_var(ncid, "Napoleon", NC_BYTE, 2, dimids_gen1, &napoleanid))) ERR; if ((res = nc_def_var(ncid, "Collins", NC_DOUBLE, 2, dimids_gen1, @@ -467,7 +467,7 @@ main(int argc, char **argv) if ((res = nc_def_var(ncid, "Washington", NC_SHORT, 2, dimids_gen1, &washingtonid))) ERR; - if ((res = nc_def_var(ncid, "Napolean", NC_BYTE, 2, dimids_gen1, + if ((res = nc_def_var(ncid, "Napoleon", NC_BYTE, 2, dimids_gen1, &napoleanid))) ERR; if ((res = nc_def_var(ncid, "Cromwell", NC_DOUBLE, 2, dimids_gen, @@ -504,7 +504,7 @@ main(int argc, char **argv) if ((res = nc_def_var(ncid, "Washington", NC_SHORT, 2, dimids_gen1, &washingtonid))) ERR; - if ((res = nc_def_var(ncid, "Napolean", NC_BYTE, 2, dimids_gen1, + if ((res = nc_def_var(ncid, "Napoleon", NC_BYTE, 2, dimids_gen1, &napoleanid))) ERR; if ((res = nc_def_var(ncid, "Cromwell", NC_DOUBLE, 2, dimids_gen, @@ -538,7 +538,7 @@ main(int argc, char **argv) if ((res = nc_def_var(ncid, "Washington", NC_SHORT, 2, dimids_gen1, &washingtonid))) ERR; - if ((res = nc_def_var(ncid, "Napolean", NC_SHORT, 2, dimids_gen1, + if ((res = nc_def_var(ncid, "Napoleon", NC_SHORT, 2, dimids_gen1, &napoleanid))) ERR; if ((res = nc_def_var(ncid, "Cromwell", NC_SHORT, 2, dimids_gen, diff --git a/nc_test/test_put.c b/nc_test/test_put.c index 39e5e2d1a..90d0b918b 100644 --- a/nc_test/test_put.c +++ b/nc_test/test_put.c @@ -4219,7 +4219,7 @@ test_nc_put_var_text(void) #line 478 #line 478 - /* Preceeding has written nothing for record variables, now try */ + /* Preceding has written nothing for record variables, now try */ #line 478 /* again with more than 0 records */ #line 478 @@ -4464,7 +4464,7 @@ test_nc_put_var_uchar(void) #line 479 #line 479 - /* Preceeding has written nothing for record variables, now try */ + /* Preceding has written nothing for record variables, now try */ #line 479 /* again with more than 0 records */ #line 479 @@ -4709,7 +4709,7 @@ test_nc_put_var_schar(void) #line 480 #line 480 - /* Preceeding has written nothing for record variables, now try */ + /* Preceding has written nothing for record variables, now try */ #line 480 /* again with more than 0 records */ #line 480 @@ -4954,7 +4954,7 @@ test_nc_put_var_short(void) #line 481 #line 481 - /* Preceeding has written nothing for record variables, now try */ + /* Preceding has written nothing for record variables, now try */ #line 481 /* again with more than 0 records */ #line 481 @@ -5199,7 +5199,7 @@ test_nc_put_var_int(void) #line 482 #line 482 - /* Preceeding has written nothing for record variables, now try */ + /* Preceding has written nothing for record variables, now try */ #line 482 /* again with more than 0 records */ #line 482 @@ -5444,7 +5444,7 @@ test_nc_put_var_long(void) #line 483 #line 483 - /* Preceeding has written nothing for record variables, now try */ + /* Preceding has written nothing for record variables, now try */ #line 483 /* again with more than 0 records */ #line 483 @@ -5689,7 +5689,7 @@ test_nc_put_var_float(void) #line 484 #line 484 - /* Preceeding has written nothing for record variables, now try */ + /* Preceding has written nothing for record variables, now try */ #line 484 /* again with more than 0 records */ #line 484 @@ -5934,7 +5934,7 @@ test_nc_put_var_double(void) #line 485 #line 485 - /* Preceeding has written nothing for record variables, now try */ + /* Preceding has written nothing for record variables, now try */ #line 485 /* again with more than 0 records */ #line 485 diff --git a/nc_test/test_put.m4 b/nc_test/test_put.m4 index 526dc3812..0a9fbcf5c 100644 --- a/nc_test/test_put.m4 +++ b/nc_test/test_put.m4 @@ -414,7 +414,7 @@ test_nc_put_var_$1(void) } } - /* Preceeding has written nothing for record variables, now try */ + /* Preceding has written nothing for record variables, now try */ /* again with more than 0 records */ /* Write record number NRECS to force writing of preceding records */ diff --git a/nc_test/tst_atts3.c b/nc_test/tst_atts3.c index fdd2049ff..5a9810cf7 100644 --- a/nc_test/tst_atts3.c +++ b/nc_test/tst_atts3.c @@ -22,7 +22,7 @@ #define DIM2_LEN 15 #define ATT_INT_NAME "Old_Bailey_Room_Numbers" #define ATT_DOUBLE_NAME "Equity_Court_Canteen_Charges" -#define ATT_SHORT_NAME "Ecclesiastical_Court_Appearences" +#define ATT_SHORT_NAME "Ecclesiastical_Court_Appearances" #define ATT_TEXT_NAME "Speech_to_Jury" #define ATT_TEXT_NAME2 "Speech_to_She_Who_Must_be_Obeyed" #define ATT_UCHAR_NAME "Number_of_current_briefs" diff --git a/nc_test4/bm_file.c b/nc_test4/bm_file.c index 4f1f3ba25..e61bbaab7 100644 --- a/nc_test4/bm_file.c +++ b/nc_test4/bm_file.c @@ -680,7 +680,7 @@ int copy_file(char *file_name_in, char *file_name_out, int cmode_out, /* Get the start and count arrays, and also the increment of the * start array zeroth element, the number of read steps, the - * lenght of a slice in number of elements, and the count needed + * length of a slice in number of elements, and the count needed * for the final read, in the cases where the length of the * zeroth dimension is not evenly divisible by slow_count. The * variable slow_count is the number of elements in the slowest @@ -1005,7 +1005,7 @@ main(int argc, char **argv) { if (use_par) { - printf("Can't use start/count/slice for paralell runs yet!\n"); + printf("Can't use start/count/slice for parallel runs yet!\n"); return 2; } } diff --git a/nc_test4/run_bm.sh b/nc_test4/run_bm.sh index d1619cfd9..f76575b88 100755 --- a/nc_test4/run_bm.sh +++ b/nc_test4/run_bm.sh @@ -49,7 +49,7 @@ if ! test -f $TMP/${d1}-3d.nc3; then cp /upc/share/testdata/nssl/mosaic3d_nc/tile1/20070803-2300.netcdf $TMP/${d1}-3d.nc3 fi -# Test diferent compressions, with and without shuffle. +# Test different compressions, with and without shuffle. out1=radar_3d_compression.txt c0=3 c1=100 diff --git a/nc_test4/tst_atts1.c b/nc_test4/tst_atts1.c index 719bc2a87..705629fea 100644 --- a/nc_test4/tst_atts1.c +++ b/nc_test4/tst_atts1.c @@ -22,7 +22,7 @@ #define DIM2_LEN 15 #define ATT_INT_NAME "Old_Bailey_Room_Numbers" #define ATT_DOUBLE_NAME "Equity_Court_Canteen_Charges" -#define ATT_SHORT_NAME "Ecclesiastical_Court_Appearences" +#define ATT_SHORT_NAME "Ecclesiastical_Court_Appearances" #define ATT_TEXT_NAME "Speech_to_Jury" #define ATT_TEXT_NAME2 "Speech_to_She_Who_Must_be_Obeyed" #define ATT_UCHAR_NAME "Number_of_current_briefs" diff --git a/nc_test4/tst_camrun.c b/nc_test4/tst_camrun.c index 17c8f4823..a76a59d1d 100644 --- a/nc_test4/tst_camrun.c +++ b/nc_test4/tst_camrun.c @@ -5693,10 +5693,10 @@ main() if (nc_put_att_text(ncid, FLUTC_id, "long_name", 48, "Clearsky upwelling longwave flux at top of model")) ERR; if (nc_put_att_text(ncid, FLUTC_id, "cell_methods", 10, "time: mean")) ERR; if (nc_put_att_text(ncid, FREQSH_id, "units", 8, "fraction")) ERR; - if (nc_put_att_text(ncid, FREQSH_id, "long_name", 42, "Fractional occurance of shallow convection")) ERR; + if (nc_put_att_text(ncid, FREQSH_id, "long_name", 42, "Fractional occurrence of shallow convection")) ERR; if (nc_put_att_text(ncid, FREQSH_id, "cell_methods", 10, "time: mean")) ERR; if (nc_put_att_text(ncid, FREQZM_id, "units", 8, "fraction")) ERR; - if (nc_put_att_text(ncid, FREQZM_id, "long_name", 37, "Fractional occurance of ZM convection")) ERR; + if (nc_put_att_text(ncid, FREQZM_id, "long_name", 37, "Fractional occurrence of ZM convection")) ERR; if (nc_put_att_text(ncid, FREQZM_id, "cell_methods", 10, "time: mean")) ERR; if (nc_put_att_text(ncid, FSDS_id, "Sampling_Sequence", 8, "rad_lwsw")) ERR; if (nc_put_att_text(ncid, FSDS_id, "units", 4, "W/m2")) ERR; @@ -6065,7 +6065,7 @@ main() if (nc_put_att_text(ncid, SO2_id, "long_name", 3, "SO2")) ERR; if (nc_put_att_text(ncid, SO2_id, "cell_methods", 10, "time: mean")) ERR; if (nc_put_att_text(ncid, SO2_CLXF_id, "units", 11, "molec/cm2/s")) ERR; - if (nc_put_att_text(ncid, SO2_CLXF_id, "long_name", 47, "vertically intergrated external forcing for SO2")) ERR; + if (nc_put_att_text(ncid, SO2_CLXF_id, "long_name", 47, "vertically integrated external forcing for SO2")) ERR; if (nc_put_att_text(ncid, SO2_CLXF_id, "cell_methods", 10, "time: mean")) ERR; if (nc_put_att_text(ncid, SO2_XFRC_id, "units", 11, "molec/cm3/s")) ERR; if (nc_put_att_text(ncid, SO2_XFRC_id, "long_name", 24, "external forcing for SO2")) ERR; @@ -6167,7 +6167,7 @@ main() if (nc_put_att_text(ncid, TROP_P_id, "long_name", 19, "Tropopause Pressure")) ERR; if (nc_put_att_text(ncid, TROP_P_id, "cell_methods", 10, "time: mean")) ERR; if (nc_put_att_text(ncid, TROP_PD_id, "units", 11, "probability")) ERR; - if (nc_put_att_text(ncid, TROP_PD_id, "long_name", 21, "Tropopause Probabilty")) ERR; + if (nc_put_att_text(ncid, TROP_PD_id, "long_name", 21, "Tropopause Probability")) ERR; if (nc_put_att_text(ncid, TROP_PD_id, "cell_methods", 10, "time: mean")) ERR; { /* _FillValue */ static const double TROP_T_FillValue_att[1] = {1e+36} ; @@ -6279,7 +6279,7 @@ main() if (nc_put_att_text(ncid, bc_a1TBF_id, "long_name", 35, "bc_a1 turbulent dry deposition flux")) ERR; if (nc_put_att_text(ncid, bc_a1TBF_id, "cell_methods", 10, "time: mean")) ERR; if (nc_put_att_text(ncid, bc_a1_CLXF_id, "units", 11, "molec/cm2/s")) ERR; - if (nc_put_att_text(ncid, bc_a1_CLXF_id, "long_name", 49, "vertically intergrated external forcing for bc_a1")) ERR; + if (nc_put_att_text(ncid, bc_a1_CLXF_id, "long_name", 49, "vertically integrated external forcing for bc_a1")) ERR; if (nc_put_att_text(ncid, bc_a1_CLXF_id, "cell_methods", 10, "time: mean")) ERR; if (nc_put_att_text(ncid, bc_a1_XFRC_id, "units", 11, "molec/cm3/s")) ERR; if (nc_put_att_text(ncid, bc_a1_XFRC_id, "long_name", 26, "external forcing for bc_a1")) ERR; @@ -6688,7 +6688,7 @@ main() if (nc_put_att_text(ncid, num_a1TBF_id, "long_name", 36, "num_a1 turbulent dry deposition flux")) ERR; if (nc_put_att_text(ncid, num_a1TBF_id, "cell_methods", 10, "time: mean")) ERR; if (nc_put_att_text(ncid, num_a1_CLXF_id, "units", 11, "molec/cm2/s")) ERR; - if (nc_put_att_text(ncid, num_a1_CLXF_id, "long_name", 50, "vertically intergrated external forcing for num_a1")) ERR; + if (nc_put_att_text(ncid, num_a1_CLXF_id, "long_name", 50, "vertically integrated external forcing for num_a1")) ERR; if (nc_put_att_text(ncid, num_a1_CLXF_id, "cell_methods", 10, "time: mean")) ERR; if (nc_put_att_text(ncid, num_a1_XFRC_id, "units", 11, "molec/cm3/s")) ERR; if (nc_put_att_text(ncid, num_a1_XFRC_id, "long_name", 27, "external forcing for num_a1")) ERR; @@ -6739,7 +6739,7 @@ main() if (nc_put_att_text(ncid, num_a2TBF_id, "long_name", 36, "num_a2 turbulent dry deposition flux")) ERR; if (nc_put_att_text(ncid, num_a2TBF_id, "cell_methods", 10, "time: mean")) ERR; if (nc_put_att_text(ncid, num_a2_CLXF_id, "units", 11, "molec/cm2/s")) ERR; - if (nc_put_att_text(ncid, num_a2_CLXF_id, "long_name", 50, "vertically intergrated external forcing for num_a2")) ERR; + if (nc_put_att_text(ncid, num_a2_CLXF_id, "long_name", 50, "vertically integrated external forcing for num_a2")) ERR; if (nc_put_att_text(ncid, num_a2_CLXF_id, "cell_methods", 10, "time: mean")) ERR; if (nc_put_att_text(ncid, num_a2_XFRC_id, "units", 11, "molec/cm3/s")) ERR; if (nc_put_att_text(ncid, num_a2_XFRC_id, "long_name", 27, "external forcing for num_a2")) ERR; @@ -6943,7 +6943,7 @@ main() if (nc_put_att_text(ncid, pom_a1TBF_id, "long_name", 36, "pom_a1 turbulent dry deposition flux")) ERR; if (nc_put_att_text(ncid, pom_a1TBF_id, "cell_methods", 10, "time: mean")) ERR; if (nc_put_att_text(ncid, pom_a1_CLXF_id, "units", 11, "molec/cm2/s")) ERR; - if (nc_put_att_text(ncid, pom_a1_CLXF_id, "long_name", 50, "vertically intergrated external forcing for pom_a1")) ERR; + if (nc_put_att_text(ncid, pom_a1_CLXF_id, "long_name", 50, "vertically integrated external forcing for pom_a1")) ERR; if (nc_put_att_text(ncid, pom_a1_CLXF_id, "cell_methods", 10, "time: mean")) ERR; if (nc_put_att_text(ncid, pom_a1_XFRC_id, "units", 11, "molec/cm3/s")) ERR; if (nc_put_att_text(ncid, pom_a1_XFRC_id, "long_name", 27, "external forcing for pom_a1")) ERR; @@ -7003,7 +7003,7 @@ main() if (nc_put_att_text(ncid, so4_a1TBF_id, "long_name", 36, "so4_a1 turbulent dry deposition flux")) ERR; if (nc_put_att_text(ncid, so4_a1TBF_id, "cell_methods", 10, "time: mean")) ERR; if (nc_put_att_text(ncid, so4_a1_CLXF_id, "units", 11, "molec/cm2/s")) ERR; - if (nc_put_att_text(ncid, so4_a1_CLXF_id, "long_name", 50, "vertically intergrated external forcing for so4_a1")) ERR; + if (nc_put_att_text(ncid, so4_a1_CLXF_id, "long_name", 50, "vertically integrated external forcing for so4_a1")) ERR; if (nc_put_att_text(ncid, so4_a1_CLXF_id, "cell_methods", 10, "time: mean")) ERR; if (nc_put_att_text(ncid, so4_a1_XFRC_id, "units", 11, "molec/cm3/s")) ERR; if (nc_put_att_text(ncid, so4_a1_XFRC_id, "long_name", 27, "external forcing for so4_a1")) ERR; @@ -7051,7 +7051,7 @@ main() if (nc_put_att_text(ncid, so4_a2TBF_id, "long_name", 36, "so4_a2 turbulent dry deposition flux")) ERR; if (nc_put_att_text(ncid, so4_a2TBF_id, "cell_methods", 10, "time: mean")) ERR; if (nc_put_att_text(ncid, so4_a2_CLXF_id, "units", 11, "molec/cm2/s")) ERR; - if (nc_put_att_text(ncid, so4_a2_CLXF_id, "long_name", 50, "vertically intergrated external forcing for so4_a2")) ERR; + if (nc_put_att_text(ncid, so4_a2_CLXF_id, "long_name", 50, "vertically integrated external forcing for so4_a2")) ERR; if (nc_put_att_text(ncid, so4_a2_CLXF_id, "cell_methods", 10, "time: mean")) ERR; if (nc_put_att_text(ncid, so4_a2_XFRC_id, "units", 11, "molec/cm3/s")) ERR; if (nc_put_att_text(ncid, so4_a2_XFRC_id, "long_name", 27, "external forcing for so4_a2")) ERR; diff --git a/nc_test4/tst_large3.c b/nc_test4/tst_large3.c index 9bc89cf8f..c53031adc 100644 --- a/nc_test4/tst_large3.c +++ b/nc_test4/tst_large3.c @@ -2,7 +2,7 @@ Copyright 2007, UCAR/Unidata See COPYRIGHT file for copying and redistribution conditions. - This program (quickly, but not throughly) tests the large file + This program (quickly, but not thoroughly) tests the large file features. It turns off fill mode to quickly create an 8 gb file, and write one value is written, nothing is read. diff --git a/nc_test4/tst_vars2.c b/nc_test4/tst_vars2.c index 6c6c30b37..19527c093 100644 --- a/nc_test4/tst_vars2.c +++ b/nc_test4/tst_vars2.c @@ -300,7 +300,7 @@ main(int argc, char **argv) SUMMARIZE_ERR; #ifndef NO_NETCDF_2 - /* The following test is an attempt to recreate a problem occuring + /* The following test is an attempt to recreate a problem occurring in the cxx tests. The file is created in c++ in nctsts.cpp. */ printf("**** testing fill value with example from cxx tests in v2 api..."); { @@ -846,7 +846,7 @@ main(int argc, char **argv) if (nc_create(FILE_NAME, NC_NETCDF4, &ncid)) ERR; if (nc_def_var(ncid, GENERIC_NAME, NC_BYTE, 0, NULL, &varid)) ERR; - /* These don'e work, becuase the name is already in use. Make + /* These don'e work, because the name is already in use. Make * sure the correct error is returned. */ if (nc_def_grp(ncid, GENERIC_NAME, NULL) != NC_ENAMEINUSE) ERR; if (nc_def_opaque(ncid, 1, GENERIC_NAME, NULL) != NC_ENAMEINUSE) ERR; @@ -878,7 +878,7 @@ main(int argc, char **argv) if (nc_create(FILE_NAME, NC_NETCDF4, &ncid)) ERR; if (nc_def_opaque(ncid, 1, GENERIC_NAME, NULL)) ERR; - /* These don'e work, becuase the name is already in use. Make + /* These don'e work, because the name is already in use. Make * sure the correct error is returned. */ if (nc_def_grp(ncid, GENERIC_NAME, NULL) != NC_ENAMEINUSE) ERR; if (nc_def_var(ncid, GENERIC_NAME, NC_BYTE, 0, NULL, &varid) != NC_ENAMEINUSE) ERR; @@ -907,7 +907,7 @@ main(int argc, char **argv) if (nc_create(FILE_NAME, NC_NETCDF4, &ncid)) ERR; if (nc_def_grp(ncid, GENERIC_NAME, NULL)) ERR; - /* These don'e work, becuase the name is already in use. Make + /* These don'e work, because the name is already in use. Make * sure the correct error is returned. */ if (nc_def_opaque(ncid, 1, GENERIC_NAME, NULL) != NC_ENAMEINUSE) ERR; if (nc_def_var(ncid, GENERIC_NAME, NC_BYTE, 0, NULL, &varid) != NC_ENAMEINUSE) ERR; diff --git a/nc_test4/tst_vars3.c b/nc_test4/tst_vars3.c index 173a9ab46..370784f17 100644 --- a/nc_test4/tst_vars3.c +++ b/nc_test4/tst_vars3.c @@ -262,7 +262,7 @@ main(int argc, char **argv) if (nc_inq_var(ncid, 1, NULL, NULL, &ndims, dimids_in, NULL)) ERR; if (ndims != 3 || dimids_in[0] != 0 || dimids_in[1] != 2 || dimids_in[2] != 1) ERR; - /* Read the record of non-existant data. */ + /* Read the record of non-existent data. */ if (nc_get_vara(ncid, 1, cor, edg, P_data)) ERR; for (i = 0; i < LEN; i++) if (P_data[i] != NC_FILL_FLOAT) ERR; diff --git a/ncdap_test/expected3/in.nc.dmp b/ncdap_test/expected3/in.nc.dmp index 4cc005853..270be292c 100644 --- a/ncdap_test/expected3/in.nc.dmp +++ b/ncdap_test/expected3/in.nc.dmp @@ -244,7 +244,7 @@ variables: float tpt(time) ; tpt:long_name = "Temperature" ; tpt:units = "kelvin" ; - tpt:hieght = "Leave mispelled for NCO User\'s guide example" ; + tpt:hieght = "Leave misspelled for NCO User\'s guide example" ; double rec_var_dbl_mss_val_dbl_upk(time) ; rec_var_dbl_mss_val_dbl_upk:long_name = "record variable, double, with double missing values" ; rec_var_dbl_mss_val_dbl_upk:purpose = "This variable is used to generate the packed variable rec_var_dbl_mss_val_dbl_pck, so its missing_value should not be too far out of range, i.e., it should be representable by a short. However, the missing_value should itself be the same type as the unpacked variable, NC_DOUBLE in this case." ; diff --git a/ncdap_test/expected3/in1.nc.dmp b/ncdap_test/expected3/in1.nc.dmp index d31d7d35c..74f8be593 100644 --- a/ncdap_test/expected3/in1.nc.dmp +++ b/ncdap_test/expected3/in1.nc.dmp @@ -255,7 +255,7 @@ variables: float tpt(time) ; tpt:long_name = "Temperature" ; tpt:units = "kelvin" ; - tpt:hieght = "Leave hieght mispelled for NCO User\'s guide example" ; + tpt:hieght = "Leave hieght misspelled for NCO User\'s guide example" ; double rec_var_dbl_mss_val_dbl_upk(time) ; rec_var_dbl_mss_val_dbl_upk:long_name = "record variable, double, with double missing values" ; rec_var_dbl_mss_val_dbl_upk:purpose = "This variable is used to generate the packed variable rec_var_dbl_mss_val_dbl_pck, so its missing_value should not be too far out of range, i.e., it should be representable by a short. However, the missing_value should itself be the same type as the unpacked variable, NC_DOUBLE in this case." ; diff --git a/ncdap_test/expected3/in_2.nc.dmp b/ncdap_test/expected3/in_2.nc.dmp index 17c50837e..63d0f479f 100644 --- a/ncdap_test/expected3/in_2.nc.dmp +++ b/ncdap_test/expected3/in_2.nc.dmp @@ -245,7 +245,7 @@ variables: float tpt(time) ; tpt:long_name = "Temperature" ; tpt:units = "kelvin" ; - tpt:hieght = "Leave mispelled for NCO User\'s guide example" ; + tpt:hieght = "Leave misspelled for NCO User\'s guide example" ; double rec_var_dbl_mss_val_dbl_upk(time) ; rec_var_dbl_mss_val_dbl_upk:long_name = "record variable, double, with double missing values" ; rec_var_dbl_mss_val_dbl_upk:purpose = "This variable is used to generate the packed variable rec_var_dbl_mss_val_dbl_pck, so its missing_value should not be too far out of range, i.e., it should be representable by a short. However, the missing_value should itself be the same type as the unpacked variable, NC_DOUBLE in this case." ; diff --git a/ncdap_test/expected3/in_no_three_double_dmn.nc.dmp b/ncdap_test/expected3/in_no_three_double_dmn.nc.dmp index ca15ca58f..77ed7ee32 100644 --- a/ncdap_test/expected3/in_no_three_double_dmn.nc.dmp +++ b/ncdap_test/expected3/in_no_three_double_dmn.nc.dmp @@ -244,7 +244,7 @@ variables: float tpt(time) ; tpt:long_name = "Temperature" ; tpt:units = "kelvin" ; - tpt:hieght = "Leave mispelled for NCO User\'s guide example" ; + tpt:hieght = "Leave misspelled for NCO User\'s guide example" ; double rec_var_dbl_mss_val_dbl_upk(time) ; rec_var_dbl_mss_val_dbl_upk:long_name = "record variable, double, with double missing values" ; rec_var_dbl_mss_val_dbl_upk:purpose = "This variable is used to generate the packed variable rec_var_dbl_mss_val_dbl_pck, so its missing_value should not be too far out of range, i.e., it should be representable by a short. However, the missing_value should itself be the same type as the unpacked variable, NC_DOUBLE in this case." ; diff --git a/ncdap_test/testdata3/in.nc.das b/ncdap_test/testdata3/in.nc.das index f1804cd2d..6827df048 100644 --- a/ncdap_test/testdata3/in.nc.das +++ b/ncdap_test/testdata3/in.nc.das @@ -301,7 +301,7 @@ Attributes { tpt { String long_name "Temperature"; String units "kelvin"; - String hieght "Leave mispelled for NCO User's guide example"; + String hieght "Leave misspelled for NCO User's guide example"; } rec_var_dbl_mss_val_dbl_upk { String long_name "record variable, double, with double missing values"; diff --git a/ncdap_test/testdata3/in1.nc.das b/ncdap_test/testdata3/in1.nc.das index 59e759711..daf96ec91 100644 --- a/ncdap_test/testdata3/in1.nc.das +++ b/ncdap_test/testdata3/in1.nc.das @@ -312,7 +312,7 @@ Attributes { tpt { String long_name "Temperature"; String units "kelvin"; - String hieght "Leave hieght mispelled for NCO User's guide example"; + String hieght "Leave hieght misspelled for NCO User's guide example"; } rec_var_dbl_mss_val_dbl_upk { String long_name "record variable, double, with double missing values"; diff --git a/ncdap_test/testdata3/in_2.nc.das b/ncdap_test/testdata3/in_2.nc.das index f35779621..32c140786 100644 --- a/ncdap_test/testdata3/in_2.nc.das +++ b/ncdap_test/testdata3/in_2.nc.das @@ -301,7 +301,7 @@ Attributes { tpt { String long_name "Temperature"; String units "kelvin"; - String hieght "Leave mispelled for NCO User's guide example"; + String hieght "Leave misspelled for NCO User's guide example"; } rec_var_dbl_mss_val_dbl_upk { String long_name "record variable, double, with double missing values"; diff --git a/ncdap_test/testdata3/in_no_three_double_dmn.nc.das b/ncdap_test/testdata3/in_no_three_double_dmn.nc.das index f1804cd2d..6827df048 100644 --- a/ncdap_test/testdata3/in_no_three_double_dmn.nc.das +++ b/ncdap_test/testdata3/in_no_three_double_dmn.nc.das @@ -301,7 +301,7 @@ Attributes { tpt { String long_name "Temperature"; String units "kelvin"; - String hieght "Leave mispelled for NCO User's guide example"; + String hieght "Leave misspelled for NCO User's guide example"; } rec_var_dbl_mss_val_dbl_upk { String long_name "record variable, double, with double missing values"; diff --git a/ncdump/chunkspec.c b/ncdump/chunkspec.c index 30832560b..d5a3b2604 100644 --- a/ncdump/chunkspec.c +++ b/ncdump/chunkspec.c @@ -31,7 +31,7 @@ static struct { * omitted, in which case it is assumed to be the entire * dimension size. That is also the default for dimensions * not mentioned in the string. - * If the chunkspec string is "/", specifiying no dimensions or + * If the chunkspec string is "/", specifying no dimensions or * chunk sizes, it indicates chunking to be turned off on output. * * Returns NC_NOERR if no error, NC_EINVAL if spec has consecutive diff --git a/ncdump/ncdump.c b/ncdump/ncdump.c index 835d25133..011a4112d 100644 --- a/ncdump/ncdump.c +++ b/ncdump/ncdump.c @@ -148,7 +148,7 @@ name_path(const char *path) cp = strrchr(path, FILE_DELIMITER); if (cp == 0) /* no delimiter */ cp = path; - else /* skip delimeter */ + else /* skip delimiter */ cp++; new = (char *) emalloc((unsigned) (strlen(cp)+1)); (void) strncpy(new, cp, strlen(cp) + 1); /* copy last component of path */ diff --git a/ncdump/nctime0.c b/ncdump/nctime0.c index 70312605e..35265b44d 100644 --- a/ncdump/nctime0.c +++ b/ncdump/nctime0.c @@ -265,7 +265,7 @@ get_timeinfo(int ncid1, int varid1, ncvar_t *vp) { * are always printed on successive lines, with line wrapping * as needed. * - * Assume: Preceeding call to pr_att_valgs has already screened + * Assume: Preceding call to pr_att_valgs has already screened * this attribute for valid primitive types for the current netcdf * model (netcdf 3 or 4). */ diff --git a/ncdump/vardata.c b/ncdump/vardata.c index 6131e78a4..620554df9 100644 --- a/ncdump/vardata.c +++ b/ncdump/vardata.c @@ -106,7 +106,7 @@ lput2( /* (1) Single space or newline/indent sequence, as needed. */ linep = linep + 1 + len1; /* new line position, without newline */ - /* add 1 extra for preceeding space */ + /* add 1 extra for preceding space */ make_newline = (wrap && (first_item || linep > max_line_len + 2)); /* NEVER new line in no-wrap mode */ diff --git a/ncgen/ConvertUTF.h b/ncgen/ConvertUTF.h index e26491536..e26e7c978 100644 --- a/ncgen/ConvertUTF.h +++ b/ncgen/ConvertUTF.h @@ -24,7 +24,7 @@ Conversions between UTF32, UTF-16, and UTF-8. Header file. - Several funtions are included here, forming a complete set of + Several functions are included here, forming a complete set of conversions between the three formats. UTF-7 is not included here, but is handled in a separate source file. diff --git a/ncgen/escapes.c b/ncgen/escapes.c index ed411f81b..5f24fa930 100644 --- a/ncgen/escapes.c +++ b/ncgen/escapes.c @@ -641,7 +641,7 @@ unescapeoct(const char* s) /* * "Un-escapes" valid escape sequences in yystring (read by lex) into the - * apropriate unescaped characters. For example, the two character + * appropriate unescaped characters. For example, the two character * sequence "\t" in yystring would be converted into a single tab character. * On return, termstring is nul terminated. * Watch out for embedded nuls and utf-8 characters. diff --git a/ncgen/genchar.c b/ncgen/genchar.c index 3570a406f..17682246d 100644 --- a/ncgen/genchar.c +++ b/ncgen/genchar.c @@ -236,7 +236,7 @@ gen_leafchararray(Dimset* dimset, int dimindex, Datalist* data, of each string constant. Expected size is then the size of concat of the string constants after padding. - There is another special case used for back compatability with ncgen3. + There is another special case used for back compatibility with ncgen3. In the datalist, all sequences of character constants (i.e. 'X') are concatenated into a single string; the result, however is not concatenated with any trailing or leading string (with double quotes). @@ -286,7 +286,7 @@ gen_leafchararray(Dimset* dimset, int dimindex, Datalist* data, } } - /* Compute crossproduct upto (but not includng) the last dimension */ + /* Compute crossproduct up to (but not including) the last dimension */ xproduct = crossproduct(dimset,dimindex,rank-1); /* Start casing it out */ diff --git a/ncgen/ref_camrun.cdl b/ncgen/ref_camrun.cdl index 2edbc3adb..2fc4353f0 100644 --- a/ncgen/ref_camrun.cdl +++ b/ncgen/ref_camrun.cdl @@ -647,13 +647,13 @@ variables: FLUTC:_ChunkSizes = 1, 96, 144 ; double FREQSH(time, lat, lon) ; FREQSH:units = "fraction" ; - FREQSH:long_name = "Fractional occurance of shallow convection" ; + FREQSH:long_name = "Fractional occurrence of shallow convection" ; FREQSH:cell_methods = "time: mean" ; FREQSH:_Storage = "chunked" ; FREQSH:_ChunkSizes = 1, 96, 144 ; double FREQZM(time, lat, lon) ; FREQZM:units = "fraction" ; - FREQZM:long_name = "Fractional occurance of ZM convection" ; + FREQZM:long_name = "Fractional occurrence of ZM convection" ; FREQZM:cell_methods = "time: mean" ; FREQZM:_Storage = "chunked" ; FREQZM:_ChunkSizes = 1, 96, 144 ; @@ -1268,7 +1268,7 @@ variables: SO2:_ChunkSizes = 1, 30, 96, 144 ; double SO2_CLXF(time, lat, lon) ; SO2_CLXF:units = "molec/cm2/s" ; - SO2_CLXF:long_name = "vertically intergrated external forcing for SO2" ; + SO2_CLXF:long_name = "vertically integrated external forcing for SO2" ; SO2_CLXF:cell_methods = "time: mean" ; SO2_CLXF:_Storage = "chunked" ; SO2_CLXF:_ChunkSizes = 1, 96, 144 ; @@ -1442,7 +1442,7 @@ variables: TROP_P:_ChunkSizes = 1, 96, 144 ; double TROP_PD(time, lev, lat, lon) ; TROP_PD:units = "probability" ; - TROP_PD:long_name = "Tropopause Probabilty" ; + TROP_PD:long_name = "Tropopause Probability" ; TROP_PD:cell_methods = "time: mean" ; TROP_PD:_Storage = "chunked" ; TROP_PD:_ChunkSizes = 1, 30, 96, 144 ; @@ -1638,7 +1638,7 @@ variables: bc_a1TBF:_ChunkSizes = 1, 96, 144 ; double bc_a1_CLXF(time, lat, lon) ; bc_a1_CLXF:units = "molec/cm2/s" ; - bc_a1_CLXF:long_name = "vertically intergrated external forcing for bc_a1" ; + bc_a1_CLXF:long_name = "vertically integrated external forcing for bc_a1" ; bc_a1_CLXF:cell_methods = "time: mean" ; bc_a1_CLXF:_Storage = "chunked" ; bc_a1_CLXF:_ChunkSizes = 1, 96, 144 ; @@ -2458,7 +2458,7 @@ variables: num_a1TBF:_ChunkSizes = 1, 96, 144 ; double num_a1_CLXF(time, lat, lon) ; num_a1_CLXF:units = "molec/cm2/s" ; - num_a1_CLXF:long_name = "vertically intergrated external forcing for num_a1" ; + num_a1_CLXF:long_name = "vertically integrated external forcing for num_a1" ; num_a1_CLXF:cell_methods = "time: mean" ; num_a1_CLXF:_Storage = "chunked" ; num_a1_CLXF:_ChunkSizes = 1, 96, 144 ; @@ -2560,7 +2560,7 @@ variables: num_a2TBF:_ChunkSizes = 1, 96, 144 ; double num_a2_CLXF(time, lat, lon) ; num_a2_CLXF:units = "molec/cm2/s" ; - num_a2_CLXF:long_name = "vertically intergrated external forcing for num_a2" ; + num_a2_CLXF:long_name = "vertically integrated external forcing for num_a2" ; num_a2_CLXF:cell_methods = "time: mean" ; num_a2_CLXF:_Storage = "chunked" ; num_a2_CLXF:_ChunkSizes = 1, 96, 144 ; @@ -2968,7 +2968,7 @@ variables: pom_a1TBF:_ChunkSizes = 1, 96, 144 ; double pom_a1_CLXF(time, lat, lon) ; pom_a1_CLXF:units = "molec/cm2/s" ; - pom_a1_CLXF:long_name = "vertically intergrated external forcing for pom_a1" ; + pom_a1_CLXF:long_name = "vertically integrated external forcing for pom_a1" ; pom_a1_CLXF:cell_methods = "time: mean" ; pom_a1_CLXF:_Storage = "chunked" ; pom_a1_CLXF:_ChunkSizes = 1, 96, 144 ; @@ -3088,7 +3088,7 @@ variables: so4_a1TBF:_ChunkSizes = 1, 96, 144 ; double so4_a1_CLXF(time, lat, lon) ; so4_a1_CLXF:units = "molec/cm2/s" ; - so4_a1_CLXF:long_name = "vertically intergrated external forcing for so4_a1" ; + so4_a1_CLXF:long_name = "vertically integrated external forcing for so4_a1" ; so4_a1_CLXF:cell_methods = "time: mean" ; so4_a1_CLXF:_Storage = "chunked" ; so4_a1_CLXF:_ChunkSizes = 1, 96, 144 ; @@ -3184,7 +3184,7 @@ variables: so4_a2TBF:_ChunkSizes = 1, 96, 144 ; double so4_a2_CLXF(time, lat, lon) ; so4_a2_CLXF:units = "molec/cm2/s" ; - so4_a2_CLXF:long_name = "vertically intergrated external forcing for so4_a2" ; + so4_a2_CLXF:long_name = "vertically integrated external forcing for so4_a2" ; so4_a2_CLXF:cell_methods = "time: mean" ; so4_a2_CLXF:_Storage = "chunked" ; so4_a2_CLXF:_ChunkSizes = 1, 96, 144 ; diff --git a/ncgen/semantics.c b/ncgen/semantics.c index bca47f7f6..e2357bfd7 100644 --- a/ncgen/semantics.c +++ b/ncgen/semantics.c @@ -1007,7 +1007,7 @@ computeunlimitedsizes(Dimset* dimset, int dimindex, Datalist* data, int ischar) xproduct = crossproduct(dimset,dimindex+1,nextunlim); if(!lastunlim) { - /* Compute candiate size of this unlimited */ + /* Compute candidate size of this unlimited */ length = data->length; unlimsize = length / xproduct; if(length % xproduct != 0) diff --git a/ncgen3/escapes.c b/ncgen3/escapes.c index 737fac06c..0e746bac9 100644 --- a/ncgen3/escapes.c +++ b/ncgen3/escapes.c @@ -12,7 +12,7 @@ /* * "Expands" valid escape sequences in yystring (read by lex) into the - * apropriate characters in termstring. For example, the two character + * appropriate characters in termstring. For example, the two character * sequence "\t" in yystring would be converted into a single tab character * in termstring. On return, termstring is properly terminated. */ diff --git a/ncgen3/genlib.c b/ncgen3/genlib.c index c38efaccc..177e45c60 100644 --- a/ncgen3/genlib.c +++ b/ncgen3/genlib.c @@ -860,7 +860,7 @@ cline( } /* - * From a long line FORTRAN statment, generates the necessary FORTRAN + * From a long line FORTRAN statement, generates the necessary FORTRAN * lines with continuation characters in column 6. If stmnt starts with "*", * it is treated as a one-line comment. Statement labels are *not* handled, * but since we don't generate any labels, we don't care. diff --git a/nctest/atttests.c b/nctest/atttests.c index 38153aa6d..5e3a4379d 100644 --- a/nctest/atttests.c +++ b/nctest/atttests.c @@ -593,7 +593,7 @@ test_ncattget(path) } /* try getting non-existent attribute, should fail */ if (ncattget(cdfid, uu_id, "nonesuch", vmax.val) != -1) { - error("%s: ncattget should fail with nonexistant attribute", pname); + error("%s: ncattget should fail with nonexistent attribute", pname); ncclose(cdfid); return ++nerrs; } if (ncclose (cdfid) == -1) { diff --git a/oc2/ocuri.c b/oc2/ocuri.c index 3f18a5542..a8fe65d50 100644 --- a/oc2/ocuri.c +++ b/oc2/ocuri.c @@ -583,7 +583,7 @@ than once, then the last occurrence is used; this is so that is possible to forcibly override user specified parameters by suffixing. IMPORTANT: client parameter string is assumed to have blanks compressed out. Returns 1 if parse -suceeded, 0 otherwise; */ +succeeded, 0 otherwise; */ int ocuridecodeparams(OCURI* ocuri)