Commit f3160498 authored by thomas.forbriger's avatar thomas.forbriger Committed by thomas.forbriger
Browse files

allow for nchar=-1 in DAST line

This is a legacy commit from before 2015-03-01.
It may be incomplete as well as inconsistent.
See COPYING.legacy and README.history for details.
this is needed by the C++ version of the library


SVN Path:     http://gpitrsvn.gpi.uni-karlsruhe.de/repos/TFSoftware/trunk
SVN Revision: 1427
SVN UUID:     67feda4a-a26e-11df-9d6e-31afc202ad0c
parent 948b3105
...@@ -63,6 +63,8 @@ c 30/04/97 T.F. added explanation for workspace idata ...@@ -63,6 +63,8 @@ c 30/04/97 T.F. added explanation for workspace idata
c V1.09 06/05/97 T.F. added clear sign and unit definition to the c V1.09 06/05/97 T.F. added clear sign and unit definition to the
c coordinate format specification and the c coordinate format specification and the
c stack data field and coordinate field format c stack data field and coordinate field format
c V1.10 23/12/03 T.F. allow for nchar=-1 in DAST line
c this is needed for C++-written files
c c
cB cB
c====================================================================== c======================================================================
...@@ -441,7 +443,7 @@ c Here is the major function that returns the actual library version ...@@ -441,7 +443,7 @@ c Here is the major function that returns the actual library version
c c
real function sff_libversion() real function sff_libversion()
real libversion real libversion
parameter(libversion=1.09) parameter(libversion=1.10)
sff_libversion=libversion sff_libversion=libversion
return return
end end
...@@ -2285,10 +2287,14 @@ c read DAT2 block ...@@ -2285,10 +2287,14 @@ c read DAT2 block
goto 1 goto 1
2 continue 2 continue
read(line(5:), *) ichecksum read(line(5:), *) ichecksum
if (nchar.ne.(iline*80)) then c The C++ library cannot know the number of characters when writing the DAST
print *,'RWData: ERROR number of data =! expected number' c line and will write '-1'. Thus we allow for a sloppy mode here.
ierr=1 if (nchar.ne.-1) then
return if (nchar.ne.(iline*80)) then
print *,'RWData: ERROR number of data =! expected number'
ierr=1
return
endif
endif endif
c decode data c decode data
call DCOMP6(nchar, cbuf, nsamp, idata, ierror) call DCOMP6(nchar, cbuf, nsamp, idata, ierror)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment