Completed first version of merge utility. Small additional changes and bugfixes.

This commit is contained in:
Yggdrasil committed 2026-04-28 18:18:31 +02:00
1 parent 01c9bf2018
commit c7b344530b
5 files changed
+401 -191

No files matched your search

+37 -3
View File
@@ -86,13 +86,14 @@ C CONTENTS IN ID1 AND ID2 AND PUT THE RESULT IN ID3. F1 AND F2, IF
C NOT 1., GIVE FACTORS BY WHICH THE ID1 AND ID2 BIN CONTENTS ARE
C MULTIPLIED BEFORE THE INDICATED OPERATION. (DIVISION WITH A
C VANISHING BIN CONTENT WILL GIVE 0.)
C OPER= 'A', 'S', 'L': FOR 'S' THE SQUARE ROOT OF THE CONTENT IN ID1
C IS TAKEN (RESULT 0 FOR NEGATIVE BIN CONTENTS) AND FOR 'L' THE
C OPER= 'A', 'S', 'L', 'I': FOR 'S' THE SQUARE ROOT OF THE CONTENT IN ID1
C IS TAKEN (RESULT 0 FOR NEGATIVE BIN CONTENTS). FOR 'L' THE
C 10-LOGARITHM IS TAKEN (A NONPOSITIVE BIN CONTENT IS BEFORE THAT
C REPLACED BY 0.8 TIMES THE SMALLEST POSITIVE BIN CONTENT).
C THEREAFTER, IN ALL THREE CASES, THE CONTENT IS MULTIPLIED BY F1
C AND ADDED WITH F2, AND THE RESULT IS PLACED IN ID3. THUS ID2
C IS DUMMY IN THESE CASES.
C IS DUMMY IN THESE CASES. FOR 'I' THE INVERSE OF THE CONTENT IN
C ID1 IS COMPUTED.
C OPER= 'M': INTENDED FOR STATISTICAL ANALYSIS, BIN-BY-BIN MEAN AND
C STANDARD DEVIATION OF A VARIABLE, ASSUMING THAT ID1 CONTAINS
C ACCUMULATED WEIGHTS, ID2 ACCUMULATED WEIGHT*VARIABLE AND
@@ -324,6 +325,11 @@ C*********************************************************************
IF(ID3.NE.0.AND.ABS(A(IS1+IC)).GT.1E-10) A(IS3+IC)=
&SQRT(MAX(A(IS3+IC)/A(IS1+IC)-A(IS2+IC)**2,ZERO))
180 A(IS1+IC)=F1*A(IS1+IC)
ELSEIF(OPER.EQ.'I') THEN
DO 190 IC=10,18+NC
FA2=F2*A(IS1+IC)
IF(ABS(FA2).LE.1E-10) A(IS3+IC)=0.
190 IF(ABS(FA2).GT.1E-10) A(IS3+IC)=F1/FA2
ENDIF
RETURN
END
@@ -931,6 +937,34 @@ C-----------------------------------------------------------------------
GOTO 200
ENDIF
END
C-----------------------------------------------------------------------
C --- SIMPLE UTILITY TO OBTAIN HIST PROPERTIES
SUBROUTINE GPROP1(ID, NX, XMIN, XMAX)
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
COMMON /GBOOK/ A(NSIZE)
PARAMETER (NXMAX=1000)
IF (ID.GT.NMAX) THEN
NX = 0
XMIN = 0
XMAX = 0
RETURN
ENDIF
IS = NINT(A(ID+2))
NX = NINT(A(IS+1))
XMIN = SNGL(A(IS+2))
XMAX = SNGL(A(IS+3))
IF (NX.GT.NXMAX) THEN
NX = NXMAX
ENDIF
RETURN
END
C-----------------------------------------------------------------------
SUBROUTINE GREAD(FILE)
IMPLICIT INTEGER (I-N)