Skip to content

Feature/cdf reader upgrade #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ElonOlsson wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/cdf reader upgrade #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5a5771
update cdf reader from 3.5 to 3.8
ElonOlsson Jun 15, 2020
da6852a
merge temp branch
ElonOlsson Jun 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ext/cdf/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# General settings
#########################################################################################
if (NOT CDF_ROOT_DIR)
set(CDF_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cdf35_0-dist)
set(CDF_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cdf38_0-dist)
endif ()

#########################################################################################
Expand Down Expand Up @@ -41,8 +41,8 @@ if(CDF_BUILD_ZLIB)

set(ALL_SOURCE ${ALL_SOURCE} ${ZLIB_SOURCE})
endif(CDF_BUILD_ZLIB)

add_definitions(-Di386 -D__MACH__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DHAVE_STDARG_H -DHAVE_UNISTD_H -DZ_PREFIX)
# old(cdf35_0-dist): add_definitions(-Di386 -D__MACH__ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DHAVE_STDARG_H -DHAVE_UNISTD_H -DZ_PREFIX)
add_definitions(-c -nologo -W3 -Gm -GX -ZI -Od -D_WIN32 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
if(__APPLE__)
add_definitions(-Dmac )
endif(__APPLE__)
Expand Down
84 changes: 0 additions & 84 deletions ext/cdf/cdf35_0-dist/Release.notes
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ext/cdf/cdf35_0-dist/src/lib/zlib/ACKNOWLEDGMENT.txt
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions ext/cdf/cdf35_0-dist/src/lib/zlib/uncompr.c
View file
Open in desktop

This file was deleted.

48 changes: 48 additions & 0 deletions ext/cdf/cdf38_0-dist/CDFLeapSeconds.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
; Source: <http://maia.usno.navy.mil/ser7/tai-utc.dat>
; Updated: 20161025
; Leap Seconds Table - used by CDF
; Update it when a leap second(s) is added.
; Comment lines starts with ";" at column 1.
; Year Month Day Leap Seconds Drift
1960 1 1 1.4178180 37300.0 0.001296
1961 1 1 1.4228180 37300.0 0.001296
1961 8 1 1.3728180 37300.0 0.001296
1962 1 1 1.8458580 37665.0 0.0011232
1963 11 1 1.9458580 37665.0 0.0011232
1964 1 1 3.2401300 38761.0 0.001296
1964 4 1 3.3401300 38761.0 0.001296
1964 9 1 3.4401300 38761.0 0.001296
1965 1 1 3.5401300 38761.0 0.001296
1965 3 1 3.6401300 38761.0 0.001296
1965 7 1 3.7401300 38761.0 0.001296
1965 9 1 3.8401300 38761.0 0.001296
1966 1 1 4.3131700 39126.0 0.002592
1968 2 1 4.2131700 39126.0 0.002592
1972 1 1 10.0 0.0 0.0
1972 7 1 11.0 0.0 0.0
1973 1 1 12.0 0.0 0.0
1974 1 1 13.0 0.0 0.0
1975 1 1 14.0 0.0 0.0
1976 1 1 15.0 0.0 0.0
1977 1 1 16.0 0.0 0.0
1978 1 1 17.0 0.0 0.0
1979 1 1 18.0 0.0 0.0
1980 1 1 19.0 0.0 0.0
1981 7 1 20.0 0.0 0.0
1982 7 1 21.0 0.0 0.0
1983 7 1 22.0 0.0 0.0
1985 7 1 23.0 0.0 0.0
1988 1 1 24.0 0.0 0.0
1990 1 1 25.0 0.0 0.0
1991 1 1 26.0 0.0 0.0
1992 7 1 27.0 0.0 0.0
1993 7 1 28.0 0.0 0.0
1994 7 1 29.0 0.0 0.0
1996 1 1 30.0 0.0 0.0
1997 7 1 31.0 0.0 0.0
1999 1 1 32.0 0.0 0.0
2006 1 1 33.0 0.0 0.0
2009 1 1 34.0 0.0 0.0
2012 7 1 35.0 0.0 0.0
2015 7 1 36.0 0.0 0.0
2017 1 1 37.0 0.0 0.0
2 changes: 1 addition & 1 deletion ext/cdf/cdf35_0-dist/CDF_copyright.txt → ext/cdf/cdf38_0-dist/CDF_copyright.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2014
Common Data Format (CDF)
Space Physics Data Facility
NASA/Goddard Space Flight Center

Expand Down
123 changes: 120 additions & 3 deletions ext/cdf/cdf35_0-dist/CHANGES.txt → ext/cdf/cdf38_0-dist/CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CDF Changes Log, CDF V3.3
CDF Changes Log, CDF V3.7

V2.0.0 11-Feb-91 Release of CDF V2.0.
V2.1.0 7-Jun-91 Release of CDF V2.1.
Expand Down Expand Up @@ -177,6 +177,123 @@ V3.5.0 25-Feb-13 The original beta version
Minor code changes for filling space(s) for writing string
type pad value. 64-bit Windows package now distributes
64-bit Cygwin-based libraries and tools. Bugs fixed. Added
support for nan, inf and -inf for floting point values in
support for nan, inf and -inf for floating point values in
the tool programs.

V3.6.0 5-Feb-15 for version 3.6.0.3
Added a new leap second for 2015-07-01 to the leap second
table. Added a field "LeapSecondLastUpdated" in GDR to
record what leap second table a CDF is based upon. A set of
functions to read/write/validate the field is added.
Added an option to renumber the sparse variable records
after a record(s) is deleted. Added sort and detect options
in tool cdfconvert. Skip checking the file/path name's
characters when reading a CDF file. Enforce ASCII chars for
file name (not including the directory portion) only. Minor
bug fixes.
1-May-15 for version 3.6.0.4
Modified cdfjava.jar. Extended status text length.
V3.6.1 20-Sep-15 for version 3.6.1.0
Used the preserved system temporary folder, e.g., /tmp
for Linux/Unix/MacOSX, to hold the temporary file(s)
while doing compression/decompression. Set
temporary file name using the random number generator with
process id and current time as the seed. Added support
for computing TT2000 from UTC if the passed day is DOY
(day of the year from January 1st). Added a few options
to cdfconvert tool program.
V3.6.2 20-Mar-16 for version 3.6.2.0
Modified to Makefile and installation process to support
Mac OS X El Captain (10.11). Modified the library to handle
string data that has a shorter length than defined (number
of elements) when reading/writing. It will be filled with
spaces, starting from the NUL.
13-May-16 for version 3.6.2.1
Bug fixed for handling TT2000 time computing if only
year/month/day is given. Speed up the leap second
time/table validation.
V3.6.3 20-Oct-16 for version 3.6.3.0
Added a new set of C-based APIs for reading the CDF data.
Each of these APIs, identified as CDFread..., will return
a pointer to the library allocated space for the data.
Caller is responsible to free the space after use. New
features were added to cdfstats and cdfdump tool programs.
A new leap second is added for 1/1/2017.
10-Jan-17 for version 3.6.3.1
Updated the leap second last updated header in a CDF from
the (latest) leap second table if the CDF is created based
on an existing master CDF that has an older leap second
table.
V3.6.4 10-Feb-17 for version 3.6.4.0
For Unix-based systems, use C's "mkstemp" function to create
the temporary files, in the template form of
"mycdftmp.XXXXXX". On Windows, use VS's "_mktemp_s" to do
the same. Use the random number generator to create the
temporary file name as the last resort if C's function
fails to create one.
For Unix-based systems, the temporary files will be
created in the current directory if it is writable and
neither environment variable CDF_TMP nor TMPDIR is defined.
Otherwise, it will try the directory defined by the
environment variable CDF_TMP first and then TMPDIR.
If the current directory is not writable, then system's
"/tmp" is used. On Windows, both "TMP" and "TEMP" directory
will be tried if CDF_TMP is not defined. If all fail,
the last resort is to use the current directory.
Modified cdfexport to not truncate variable name while
displaying its data. Have a separate patch for supporting
IDL 8.6.
V3.7.0 11-May-18 for version 3.7.0.0
For variable attribute, multi-strings are allowed. A header
field in the internal data structure for entry is used to
stored the number of strings. A function to free the
retrieved strings, when reading, is created. The data
validation control process, thru CDF_VALIDATE environment
variable, is modified to also skip the checksum
verification, in addition to the data sanity check, if the
validation is turned off. cdfconvert tool allows the output
of the converted file to replace the source file.
Added support for ARM ports, little or big-endian. The
string-typed data for attribute entry or variable data can
be Nul-terminated. The default pad value can also be empty.
Previously, space(s) is filled if the data length is
shorter than the defined number of elements. Added openVMS
on Itanium (IA64) ports: IA64VMSi, IA64VMSd and IA64VMSg.
Added cdfj.jar, the pure Java package for CDF read and
write without needing CDF library and JNI. A revised cdf
schema is included for CDF's XML support.
V3.7.1 21-Aug-18 for version 3.7.1.0
Modified to make the encoded date/time string for CDF_EPOCH
and CDF_EPOCH16 in the form of ISO 8601 as the default, as
yyyy-mm-ddThh:mm:ss.ccc or yyyy-mm-ddThh:mm:ss.cccuuunnnppp
respectively. Enhanced the CDFML xsd schema. Do not throw
an error if the ILLEGAL_TT2000_VALUE is encountered. When
encoding its value into date/time string, it is presented
as 1707-09-22T12:12:10.961224195. (Read CDF's C document.)
Add a set of general encoding/parsing functions for each
of the CDF epoch data type. Added a set of time conversion
functions between CDF_EPOCH/CDF_EPOCH16/CDF_TIME_TT2000 time
and unix time. Reset the rVariables' dimension to zero if
a cdf is converted, by cdfconvert, with "zMode 2".
V3.8.0 27-Oct-19 for version 3.8.0.0
Modified the code to use a variable's FILLVAL, replacing
its PAD value, for all record varying variable's virtual
record data if it exists. To use FILLVAL, it must have a
data type equivalent to its variable's. String typed
variable's pad value is filled with a single space and
followed by NUL(s), instead of multiple spaces.
Changed skt2cdf tool program to allow handling a skeleton
table directly from Windows (with \r\n at the end in each
line) on non-Windows systems. Added new options to
cdfconvert tool program to
1. remove non-varying dimension(s) from the source
zVariable(s) if it does not have DEPEND_* attribute
defined to the destination variable.
2. replace any pad value(s) in a variable's data by its
FILLVAL value, if FILLVAL attribute exists and has
an equivalent data type as variable's.
Modified the tool programs to use FORMAT attribute to encode
both data and metadata if the format is to be used. These
include all C-based and Java-based tools. A new option is
added to cdf2skt tool to allow users to choose how to
display variable's metadata and data, either with or witout
format.
Loading