diff --git a/mcstas-comps/contrib/Fermi_chop2a.comp b/mcstas-comps/contrib/Fermi_chop2a.comp
index 1657bd472..f585ec6d4 100644
--- a/mcstas-comps/contrib/Fermi_chop2a.comp
+++ b/mcstas-comps/contrib/Fermi_chop2a.comp
@@ -51,7 +51,7 @@ SHARE
/*routine to calculate x and y positions of a neutron in a fermi chopper */
#pragma acc routine
- void neutxypos(double *x, double *y, double phi, double inrad,double c[])
+ void neutxypos(double *x, double *y, double phi, double inrad, double* c)
{
*x=c[0]+inrad*cos(phi);
*y=c[1]+inrad*sin(phi);
@@ -59,7 +59,7 @@ SHARE
/* routine to calculate the origin of a circle that describes the neutron path through the chopper */
#pragma acc routine
- void calccenter(double c[],double zr[], double xr[]){
+ void calccenter(double* c, double* zr, double* xr){
double denom, A,B,C,D,a,b;
denom=2*(-zr[0]*xr[2] +zr[0]*xr[1]+ zr[1]*xr[2]+xr[0]*zr[2]-xr[0]*zr[1] - xr[1]*zr[2]);
A=xr[1]-xr[2];B=xr[0]-xr[1];C=zr[2]-zr[1];D=zr[1]-zr[0];
@@ -85,7 +85,7 @@ SHARE
* return 0 if neutron does not transmit return 1 with channel number if neutron will pass*/
#pragma acc routine
int checkabsorb(double phi,int *chan_num, double inrad,double inw, double insw,
- double inbw, double blader, double off, double c[]){
+ double inbw, double blader, double off, double* c){
double xtmp,neuzr,neuxr;
neutxypos(&neuzr,&neuxr,phi,inrad,c);
// printf("xr:%g zr:%g phi: %g r: %g c[0]: %g c[1]: %g\n",neuxr,neuzr,phi,inrad,c[0],c[1]);
diff --git a/mcstas-comps/contrib/FlatEllipse_finite_mirror.comp b/mcstas-comps/contrib/FlatEllipse_finite_mirror.comp
index 0e2e3d7d3..affb19909 100644
--- a/mcstas-comps/contrib/FlatEllipse_finite_mirror.comp
+++ b/mcstas-comps/contrib/FlatEllipse_finite_mirror.comp
@@ -126,7 +126,6 @@ DECLARE
//point structure
Point p1;
//Function to handle Conic-Neutron collisions with reflectivity from McStas Tables
- void traceNeutronConicWithTables(_class_particle* p, ConicSurf c);
double *rfront_inner;//all r-distances at lStart for all mirror surfaces
int silicon; // +1: neutron in silicon, -1: neutron in air, 0: mirrorwidth is 0; neutron cannot be in silicon and also does not track mirror transitions
t_Table rsTable;
diff --git a/mcstas-comps/contrib/GISANS_sample.comp b/mcstas-comps/contrib/GISANS_sample.comp
index 88657f96b..793602898 100644
--- a/mcstas-comps/contrib/GISANS_sample.comp
+++ b/mcstas-comps/contrib/GISANS_sample.comp
@@ -113,11 +113,11 @@ double complsqrt(double re, double im, double *imsqrt) {
};
double calclayers(double xiref, double bref, double vz, double vzi, double v,
- double zt[8],
- double xi[8], double beta[8],
- double v2re[8], double v2im[8],
- double Ot1[8], double Ot2[8],
- double In1[8], double In2[8]
+ double* zt,
+ double* xi, double* beta,
+ double* v2re, double* v2im,
+ double* Ot1, double* Ot2,
+ double* In1, double* In2
) {
/* vz und vzi haben beide das Vorzeichen der Richtung */
int i;
@@ -540,8 +540,8 @@ return 0;
DECLARE
%{
-double phase[10][10]; /* Table of different orientations in bulk phase */
-double SigB[21][182]; /* Table of total cross sections from integral */
+DArray2d phase; /* Table of different orientations in bulk phase */
+DArray2d SigB; /* Table of total cross sections from integral */
double z1[8];
double z2[8];
double zt[8];
@@ -585,6 +585,9 @@ double phirrr;
double dvx,dvy,dvz,dvzi;
double Qx,Qy,Qz;
+phase = create_darr2d(10,10);
+SigB = create_darr2d(21,182);
+
Qmin = 1e-5; /* reasonable smallest SANS Q, should be close to zero, but finite */
Qminl= log10(1e-5); /* logarithm of Qmin */
l10 = log(10.0); /* constant ln(10) */
@@ -1716,6 +1719,11 @@ outsample:
%}
+FINALLY %{
+ destroy_darr2d(phase);
+ destroy_darr2d(SigB);
+%}
+
MCDISPLAY
%{
double radius = 0;
diff --git a/mcstas-comps/contrib/SANS_benchmark2.comp b/mcstas-comps/contrib/SANS_benchmark2.comp
index fad692db4..d661e3f99 100644
--- a/mcstas-comps/contrib/SANS_benchmark2.comp
+++ b/mcstas-comps/contrib/SANS_benchmark2.comp
@@ -200,7 +200,7 @@ return J1o;
};
-double dSigdW(int sw, double Q, double Qtab[], double Itab[]) {
+double dSigdW(int sw, double Q, double* Qtab, double* Itab) {
int i;
@@ -514,7 +514,7 @@ return out;
DECLARE
%{
- double Idsdw[31][19];
+ DArray2d Idsdw;
double Qmind; /* AA-1 somehow SANS limit -- the total range should be reasonably large, so Qmind close enough to ZERO */
double Qmaxd; /* AA-1 approx. model Q-limit, where coh. scatt. becomes zero -- practical limit -- 1.0 for most SANS problems */
@@ -528,6 +528,7 @@ DECLARE
INITIALIZE
%{
+ Idsdw=create_darr2d(31,19);
Qmind = 0.0001;
Qmaxd = 2.1544346900319;
@@ -826,6 +827,10 @@ TRACE
%}
+FINALLY %{
+ destroy_darr2d(Idsdw);
+%}
+
MCDISPLAY
%{
double radius = 0;
diff --git a/mcstas-comps/contrib/SNS_source.comp b/mcstas-comps/contrib/SNS_source.comp
index d2c3d6bf1..474635960 100644
--- a/mcstas-comps/contrib/SNS_source.comp
+++ b/mcstas-comps/contrib/SNS_source.comp
@@ -58,7 +58,7 @@ SHARE %{
/* ----------------------------------------------------------------
routine to load E, I and t I data from SNS source files
-----------------------------------------------------------------*/
- void sns_source_load(char fname[], double *xvec, double *yvec, int xcol, int ycol,
+ void sns_source_load(char* fname, double *xvec, double *yvec, int xcol, int ycol,
int *veclenptr, double *tcol, double *Ecol, double **Imat,int *ntvals, int *nEvals)
{
FILE *fp;
diff --git a/mcstas-comps/contrib/Vertical_T0a.comp b/mcstas-comps/contrib/Vertical_T0a.comp
index b582c5c13..ada2396ae 100644
--- a/mcstas-comps/contrib/Vertical_T0a.comp
+++ b/mcstas-comps/contrib/Vertical_T0a.comp
@@ -44,7 +44,7 @@ SHARE
/*routine to calculate x and y positions of a neutron in a fermi chopper */
#pragma acc routine
- void neutxypos(double *x, double *y, double phi, double inrad,double c[])
+ void neutxypos(double *x, double *y, double phi, double inrad, double* c)
{
*x=c[0]+inrad*cos(phi);
*y=c[1]+inrad*sin(phi);
@@ -52,7 +52,7 @@ SHARE
/* routine to calculate the origin of a circle that describes the neutron path through the chopper */
#pragma acc routine
- void calccenter(double c[],double zr[], double xr[]){
+ void calccenter(double* c, double* zr, double* xr){
double denom, A,B,C,D,a,b;
denom=2*(-zr[0]*xr[2] +zr[0]*xr[1]+ zr[1]*xr[2]+xr[0]*zr[2]-xr[0]*zr[1] - xr[1]*zr[2]);
A=xr[1]-xr[2];B=xr[0]-xr[1];C=zr[2]-zr[1];D=zr[1]-zr[0];
@@ -65,7 +65,7 @@ SHARE
#endif
/* function to calculate if the neutron is in the channel or not
* return 0 if neutron does not transmit return 1 if neutron will pass*/
- int t0checkabsorb(double phi, double inrad,double inw1, double inw2, double c[]){
+ int t0checkabsorb(double phi, double inrad,double inw1, double inw2, double* c){
double xtmp,neuzr,neuxr;
neutxypos(&neuzr,&neuxr,phi,inrad,c);
// printf("xr:%g zr:%g phi: %g r: %g c[0]: %g c[1]: %g\n",neuxr,neuzr,phi,inrad,c[0],c[1]);
diff --git a/mcstas-comps/examples/SNS/SNS_ARCS/SNS_ARCS.instr b/mcstas-comps/examples/SNS/SNS_ARCS/SNS_ARCS.instr
index 779e5fbe4..5757cde79 100644
--- a/mcstas-comps/examples/SNS/SNS_ARCS/SNS_ARCS.instr
+++ b/mcstas-comps/examples/SNS/SNS_ARCS/SNS_ARCS.instr
@@ -119,15 +119,7 @@ COMPONENT mod=SNS_source(filename=filename,
Emin=Emin,
Emax=Emax)
AT(0,0,-13.61) ABSOLUTE
-// COMPONENT mod=SNS_source(S_filename="source_sct521_bu_17_1.dat",
-// width=0.1,
-// height=0.12,
-// dist=2.5,
-// xw=0.1,
-// yh=0.12,
-// Emin=Emin,
-// Emax=Emax)
-// AT(0,0,0) ABSOLUTE
+
COMPONENT sourceMantid=Arm()
AT(0,0,0) RELATIVE mod
COMPONENT core_ves=Guide_channeled(w1=0.094285,h1=0.11323,w2=0.084684,h2=0.102362,l=1.2444,
@@ -186,8 +178,6 @@ COMPONENT Guide_1_3_3=Guide_channeled(w1=0.06440,h1=0.07609,w2=0.06342,h2=0.0744
W=Gu_W,nslit=1,d=0.0,alphax=Gu_alpha,alphay=Gu_alpha)
AT(0,0,8.04145) RELATIVE mod
-/*COMPONENT T0_chopp=Arm()*/
-
COMPONENT t0_chopp=Vertical_T0a(len=0.474,w1=0.08,w2=0.101,nu=T0_nu,delta=0.0,tc=phase_T0,
ymin=-0.045,ymax=0.045)
AT(0,0,LT0)RELATIVE mod
@@ -219,10 +209,9 @@ COMPONENT Guide_2_1_5=Guide_channeled(w1=0.05745,h1=0.06417,w2=0.05637,h2=0.0622
W=Gu_W,nslit=1,d=0.0,alphax=Gu_alpha,alphay=Gu_alpha)
AT(0,0,11.08340) RELATIVE mod
-COMPONENT fermi_chopp=Fermi_chop2a(len=0.10,w=0.06,ymin=-.0325,ymax=.0325,
+ COMPONENT fermi_chopp=Fermi_chop2a(len=0.10,w=0.06,ymin=-.0325,ymax=.0325,
nu=Fermi_nu,delta=0.0,tc=phasefc1
,nchan=nchans,bw=0.0005,blader=nrad)
-/*COMPONENT fermi_chopp=Arm()*/
AT (0,0,LF) RELATIVE mod
/* COMPONENT Monitor1=TOF_monitor(xmin=-0.035,xmax=0.035,ymin=-0.035,ymax=0.035, */
/* tmin=tplotmin, */
diff --git a/mcstas-comps/optics/Elliptic_guide_gravity.comp b/mcstas-comps/optics/Elliptic_guide_gravity.comp
index 235ea5a0e..4b4434cde 100644
--- a/mcstas-comps/optics/Elliptic_guide_gravity.comp
+++ b/mcstas-comps/optics/Elliptic_guide_gravity.comp
@@ -34,41 +34,41 @@
* Example 1, Elliptical definition using focal points:
*
* Elliptic_guide_gravity(
-* l=50,
-* linxw=5,linyh=5,loutxw=10,loutyh=10,
-* xwidth=0.05,yheight=0.05,
-* R0=0.99,Qc=0.0219,alpha=6.07,m=1.0,W=0.003
+* l=50,
+* linxw=5,linyh=5,loutxw=10,loutyh=10,
+* xwidth=0.05,yheight=0.05,
+* R0=0.99,Qc=0.0219,alpha=6.07,m=1.0,W=0.003
* )
*
* Example 2: Half elliptical definition:
*
* Elliptic_guide_gravity(
-* l=50,
-* linxw=5,linyh=5,loutxw=10,loutyh=10,
-* xwidth=0.1,yheight=0.1,
-* R0=0.99,Qc=0.0219,alpha=6.07,m=1.0,W=0.003,
-* option = "halfEllipse",
-* dimensionsAt = "entrance"
+* l=50,
+* linxw=5,linyh=5,loutxw=10,loutyh=10,
+* xwidth=0.1,yheight=0.1,
+* R0=0.99,Qc=0.0219,alpha=6.07,m=1.0,W=0.003,
+* option = "halfEllipse",
+* dimensionsAt = "entrance"
* )
*
* Example 3: Parabolic approximation:
*
* Elliptic_guide_gravity(
-* l=50,
-* linxw=5,linyh=5,loutxw=1e6,loutyh=1e6, // values larger than 1e8 may cause erroneous results
-* xwidth=0.1,yheight=0.1,
-* R0 = 0.99,Qc=0.0219,alpha=6.07,m=1.0,W=0.003,
-* dimensionsAt = "exit"
+* l=50,
+* linxw=5,linyh=5,loutxw=1e6,loutyh=1e6, // values larger than 1e8 may cause erroneous results
+* xwidth=0.1,yheight=0.1,
+* R0 = 0.99,Qc=0.0219,alpha=6.07,m=1.0,W=0.003,
+* dimensionsAt = "exit"
* )
*
* Example 4: Elliptical definition with varying m-values:
*
* Elliptic_guide_gravity(
-* l=50,
-* linxw=5,linyh=5,loutxw=10,loutyh=10,
-* xwidth=0.1,yheight=0.1,
-* R0 = 0.99,Qc=0.0219,alpha=6.07,m=1.0,W=0.003,
-* mvaluesright=marray,mvaluesleft=marray,mvaluestop=marray,mvaluesbottom=marray
+* l=50,
+* linxw=5,linyh=5,loutxw=10,loutyh=10,
+* xwidth=0.1,yheight=0.1,
+* R0 = 0.99,Qc=0.0219,alpha=6.07,m=1.0,W=0.003,
+* mvaluesright=marray,mvaluesleft=marray,mvaluestop=marray,mvaluesbottom=marray
* )
*
* where marray is initialized as
@@ -244,7 +244,7 @@ struct SGI
define geomtric of the guide or physical values for mirrors
@param var is the input varible there the error occurred [text]
*/
-int guide_elliptical_illegalInputLessThanZero(char var[],int verbose){
+int guide_elliptical_illegalInputLessThanZero(char* var,int verbose){
if (verbose)
printf("The user defined variable %s in %s has an illegal value"
" less than zero\n",var,"Elliptic_guide_gravity");
@@ -258,7 +258,7 @@ int guide_elliptical_illegalInputLessThanZero(char var[],int verbose){
@param in,out is the input varible there the error occurred [text]
*/
int guide_elliptical_illegalInputFocalPointsHyperbola(
- char in[],char out[],
+ char* in,char* out,
double inValue,double outValue, int verbose){
if (verbose){
printf("The user defined length of the guide, length \
@@ -277,7 +277,7 @@ int guide_elliptical_illegalInputFocalPointsHyperbola(
should not be accessible if the algoritmes are working correctly
Most likely errors are floating points and ill-defined cases
*/
-void guide_elliptical_callCriticalWarning(char func[],int verbose){
+void guide_elliptical_callCriticalWarning(char* func,int verbose){
if (verbose)
printf("A CRITICAL WARNING has been called inside %s by function %s."
"This is most likely due to a programming error \
@@ -526,62 +526,6 @@ int guide_elliptical_handleGuideIntersection(
return boolean;
}
-/**
- Check if the neutron is within the guide using the sign
- of the crossproduct between the two points,
- on each of the enclosing box surface and neutrons position.
-
- @param x,y,z; position of the neutron. [m]
- @param guideInfo; pointer to the guide infomation holding structure.
- @return; return 1 if the neutron is inside the guide [boolean]
-*/
-
-/*
-int guide_elliptical_InsideEnclosingBox(double x,double y,double z,struct SGI *guideInfo){
- int guide_elliptical_IsPointInVolume(
- double *x,double *y,double *z,
- double px,double py,double pz){
- int guide_elliptical_WhichSide( double p1x,double p1y,double p1z,
- double p2x,double p2y,double p2z,
- double p3x,double p3y,double p3z,
- double px ,double py ,double pz ){
-
- double v1x = p1x - p2x, v1y = p1y-p2y, v1z = p1z-p2z;
- double v2x = p3x - p2x, v2y = p3y-p2y, v2z = p3z-p2z;
- double v3x = v2y*v1z-v2z*v1y;
- double v3y = v2z*v1x-v2x*v1z;
- double v3z = v2x*v1y-v2y*v1x;
-
- return 0 >= v3x*(px-p1x)+v3y*(py-p1y)+v3z*(pz-p1z);
- }
-
- if( //front
- guide_elliptical_WhichSide(x[3],y[3],z[3],x[2],y[2],z[2],x[1],y[1],z[1],px,py,pz) &&
- guide_elliptical_WhichSide(x[1],y[1],z[1],x[0],y[0],z[0],x[3],y[3],z[3],px,py,pz) &&
- //back
- guide_elliptical_WhichSide(x[5],y[5],z[5],x[6],y[6],z[6],x[7],y[7],z[7],px,py,pz) &&
- guide_elliptical_WhichSide(x[7],y[7],z[7],x[4],y[4],z[4],x[5],y[5],z[5],px,py,pz) &&
- //right
- guide_elliptical_WhichSide(x[7],y[7],z[7],x[3],y[3],z[3],x[0],y[0],z[0],px,py,pz) &&
- guide_elliptical_WhichSide(x[0],y[0],z[0],x[4],y[4],z[4],x[7],y[7],z[7],px,py,pz) &&
- //left
- guide_elliptical_WhichSide(x[1],y[1],z[1],x[2],y[2],z[2],x[6],y[6],z[6],px,py,pz) &&
- guide_elliptical_WhichSide(x[6],y[6],z[6],x[5],y[5],z[5],x[1],y[1],z[1],px,py,pz) &&
- //top
- guide_elliptical_WhichSide(x[0],y[0],z[0],x[1],y[1],z[1],x[5],y[5],z[5],px,py,pz) &&
- guide_elliptical_WhichSide(x[5],y[5],z[5],x[4],y[4],z[4],x[0],y[0],z[0],px,py,pz) &&
- //bottom
- guide_elliptical_WhichSide(x[6],y[6],z[6],x[2],y[2],z[2],x[3],y[3],z[3],px,py,pz) &&
- guide_elliptical_WhichSide(x[3],y[3],z[3],x[7],y[7],z[7],x[6],y[6],z[6],px,py,pz) )
- return 1;
- else return 0;
- }
- return guide_elliptical_IsPointInVolume(
- guideInfo->xArray,guideInfo->yArray,guideInfo->zArray,x,y,z);
-}
-*/
-
-
///////////////////////////////////////////////////////////////////////////
/////////////// reflection functions
///////////////////////////////////////////////////////////////////////////
@@ -1124,29 +1068,6 @@ INITIALIZE
// Applies the properties of the mirrors in the guide given by the user.
// These variables are used in the reflection functions.
-
- // Sets the mirror type of the guides mirrors
- // These variables are used in the collision functions
- // to find the type of collision
-
- // guideInfo.OuterSide[RightSide] =
- // guide_elliptical_getMirrorTypeFromInput(outer_right_side_mirror,guideInfo.verboseSetting);
- // guideInfo.OuterSide[TopSide] =
- // guide_elliptical_getMirrorTypeFromInput(outer_top_side_mirror,guideInfo.verboseSetting);
- // guideInfo.OuterSide[LeftSide] =
- // guide_elliptical_getMirrorTypeFromInput(outer_left_side_mirror,guideInfo.verboseSetting);
- // guideInfo.OuterSide[BottomSide] =
- // guide_elliptical_getMirrorTypeFromInput(outer_bottom_side_mirror,guideInfo.verboseSetting);
-
- // guideInfo.InnerSide[RightSide] =
- // guide_elliptical_getMirrorTypeFromInput(inner_right_side_mirror,guideInfo.verboseSetting);
- // guideInfo.InnerSide[TopSide] =
- // guide_elliptical_getMirrorTypeFromInput(inner_top_side_mirror,guideInfo.verboseSetting);
- // guideInfo.InnerSide[LeftSide] =
- // guide_elliptical_getMirrorTypeFromInput(inner_left_side_mirror,guideInfo.verboseSetting);
- // guideInfo.InnerSide[BottomSide] =
- // guide_elliptical_getMirrorTypeFromInput(inner_bottom_side_mirror,guideInfo.verboseSetting);
-
// Give a warning if all side of the guide is turned off,
// as the guide is essentially turned off
if( guideInfo.OuterSide[RightSide] == 1
@@ -1170,10 +1091,6 @@ INITIALIZE
MirrorTypeabsorption;
if(guideInfo.mArr[BottomSide] <= 0) guideInfo.InnerSide[BottomSide] =
MirrorTypeabsorption;
- /* if(directDefination == 0){ */
- /* guideInfo.entranceHorizontalWidth = xwidth; */
- /* guideInfo.entranceVerticalWidth = yheight; */
- /* } */
if( strcmp(option,"halfellipse") == 0 && directDefination == 0 ){
guideInfo.entranceHorizontalWidth =
@@ -1195,56 +1112,6 @@ INITIALIZE
guideInfo.EnclosingBoxOn = 0;
- /*
- double DefaultArray1[8] = { 1.0,-1.0,-1.0, 1.0, 1.0,-1.0,-1.0, 1.0};
- double DefaultArray2[8] = { 1.0, 1.0,-1.0,-1.0, 1.0, 1.0,-1.0,-1.0};
- double DefaultArray3[8] = {-1.0,-1.0,-1.0,-1.0, 1.0, 1.0, 1.0, 1.0};
-
- guideInfo.EnclosingBoxOn = 0;
- double *xinput;
- if ( xInput != NULL ){ xinput = xInput; guideInfo.EnclosingBoxOn = 1; }
- else { xinput = DefaultArray1; }
- double *yinput;
- if ( yInput != NULL ){ yinput = yInput; guideInfo.EnclosingBoxOn = 1;}
- else { yinput = DefaultArray2; }
- double *zinput;
- if ( zInput != NULL ){ zinput = zInput; guideInfo.EnclosingBoxOn = 1;}
- else { zinput = DefaultArray3; }
- */
-
- /*
- double xarray[8] ={ guideInfo.ellipseMinorAxis[0]*xinput[0],
- guideInfo.ellipseMinorAxis[2]*xinput[1],
- guideInfo.ellipseMinorAxis[2]*xinput[2],
- guideInfo.ellipseMinorAxis[0]*xinput[3],
- guideInfo.ellipseMinorAxis[0]*xinput[4],
- guideInfo.ellipseMinorAxis[2]*xinput[5],
- guideInfo.ellipseMinorAxis[2]*xinput[6],
- guideInfo.ellipseMinorAxis[0]*xinput[7] };
- double yarray[8] ={ guideInfo.ellipseMinorAxis[1]*yinput[0],
- guideInfo.ellipseMinorAxis[1]*yinput[1],
- guideInfo.ellipseMinorAxis[3]*yinput[2],
- guideInfo.ellipseMinorAxis[3]*yinput[3],
- guideInfo.ellipseMinorAxis[1]*yinput[4],
- guideInfo.ellipseMinorAxis[1]*yinput[5],
- guideInfo.ellipseMinorAxis[3]*yinput[6],
- guideInfo.ellipseMinorAxis[3]*yinput[7] };
- double zarray[8] ={ guideInfo.Length/2*zinput[0]+guideInfo.Length/2,
- guideInfo.Length/2*zinput[1]+guideInfo.Length/2,
- guideInfo.Length/2*zinput[2]+guideInfo.Length/2,
- guideInfo.Length/2*zinput[3]+guideInfo.Length/2,
- guideInfo.Length/2*zinput[4]+guideInfo.Length/2,
- guideInfo.Length/2*zinput[5]+guideInfo.Length/2,
- guideInfo.Length/2*zinput[6]+guideInfo.Length/2,
- guideInfo.Length/2*zinput[7]+guideInfo.Length/2 };
- int i = 0;
- for(i = 0; i < 8; i++){
- guideInfo.xArray[i] = xarray[i];
- guideInfo.yArray[i] = yarray[i];
- guideInfo.zArray[i] = zarray[i];
- }
- */
-
guideInfo.exitVerticalWidth =
2*sqrt(1 - ( (guideInfo.Length-guideInfo.ellipseMajorOffset[BottomSide])
*(guideInfo.Length-guideInfo.ellipseMajorOffset[BottomSide])
@@ -1295,61 +1162,6 @@ INITIALIZE
}
else guideInfo.segLength = seglength;
- /* if( guideInfo.numberOfSegments != sizeof(mvaluesright)/sizeof(mvaluesright[0]) */
- /* || guideInfo.numberOfSegments != sizeof(mvaluesleft)/sizeof(mvaluesleft[0]) */
- /* || guideInfo.numberOfSegments != sizeof(mvaluestop)/sizeof(mvaluestop[0]) */
- /* || guideInfo.numberOfSegments != sizeof(mvaluesbottom)/sizeof(mvaluesbottom[0]) */
- /* || (guideInfo.segLength == NULL */
- /* & guideInfo.numberOfSegments != sizeof(seglength)/sizeof(guideInfo.segLength[0]) */
- /* ) ) { */
-
- /* printf("Error in userinput inside %s, the length of the arrays" */
- /* " mvalues and seglength are not equal\n",NAME_CURRENT_COMP); */
- /* printf("The length of the arrays are: mValuesright is %lu," */
- /* " mvaluesleft is %lu, mvaluestop is %lu, mvaluesbottom is" */
- /* " %lu and seglength is %lu and should be %d \n; Above assume that the arrays are using double \n", */
- /* sizeof(mvaluesright)/sizeof(double), */
- /* sizeof(mvaluesleft)/sizeof(double), */
- /* sizeof(mvaluestop)/sizeof(double), */
- /* sizeof(mvaluesbottom)/sizeof(double), */
- /* sizeof(guideInfo.segLength)/sizeof(double), */
- /* guideInfo.numberOfSegments */
- /* ); */
-
- /* if ( guideInfo.verboseSetting ) { */
- /* int i; */
-
- /* printf("The Values of mvaluesright is: ["); */
- /* for(i=0; i < sizeof(mvaluesright)/sizeof(mvaluesright[0]); i++) */
- /* printf("%e,",guideInfo.mValuesright[i] ); */
- /* printf("]\n"); */
-
- /* printf("The Values of mvaluesleft is: ["); */
- /* for(i=0; i < sizeof(mvaluesleft)/sizeof(mvaluesleft[0]); i++) */
- /* printf("%e,",guideInfo.mValuesleft[i] ); */
- /* printf("]\n"); */
-
- /* printf("The Values of mvaluestop is: ["); */
- /* for(i=0; i < sizeof(mvaluestop)/sizeof(mvaluestop[0]); i++) */
- /* printf("%e,",guideInfo.mValuestop[i] ); */
- /* printf("]\n"); */
-
- /* printf("The Values of mvaluesbottom is: ["); */
- /* for(i=0; i < sizeof(mvaluesbottom)/sizeof(mvaluesbottom[0]); i++) */
- /* printf("%e,",guideInfo.mValuesbottom[i] ); */
- /* printf("]\n"); */
-
- /* printf("The Values of seglength is: ["); */
- /* for(i=0; i < sizeof(guideInfo.segLength)/sizeof(guideInfo.segLength[0]); i++) */
- /* printf("%e,",guideInfo.segLength[i]); */
- /* printf("]\n"); */
- /* } */
- /* exit( printf("Exit due to critical error in userinput for the" */
- /* " component %s, consider having a look at the input" */
- /* " for following: mvaluesright,mvaluesleft,mvaluestop," */
- /* "mvaluesbottom and/or seglength.",NAME_CURRENT_COMP) ); */
- /* } */
- //
double sumOfelements=0;
int i;
for(i=0;i< guideInfo.numberOfSegments; i++) {