diff --git a/include/main.h b/include/main.h index 6dbaa7e73cb1a69bc4d9a599eb87c159c01ef29d..cb36859a4b200b209ad0fc361f2037e4717982a7 100644 --- a/include/main.h +++ b/include/main.h @@ -45,9 +45,6 @@ extern ScalarType stype; /*! \brief Wavelength (for oscillatory kernels). */ extern double lambda; -/*! \brief Number of points per wavelength (for oscillatory kernels) on the main cylinder. */ -extern double ptsPerLambda; - /*! \brief Radius of the leaves in the trees. */ extern double radiusLeaf; diff --git a/src/main.c b/src/main.c index 93e30ebdcba956f32821adb054317950debc3e19..a8a11a207eba1f5377af006ff1a58ddb0b760f66 100644 --- a/src/main.c +++ b/src/main.c @@ -18,9 +18,7 @@ int coupled = 0; int simplePrec = 0; int complexALGO = 1; ScalarType stype = DOUBLE_COMPLEX; -double lambda = -1.; -double ptsPerLambda = 10.; -double ptsPerLambdaDetail = -1.; +double lambda; double radiusLeaf = 0.; int writeMesh = 0; int writeMeshUNV = 0; @@ -124,22 +122,9 @@ int main(int argc, char **argv) { } /* Wavelength */ - if (MpfArgGetDouble(&argc, argv, 1, "-lambda", &lambda)) { - printf("Reading lambda = %f\n", lambda) ; - ptsPerLambda=-1; // Just to remember that this value wasn't used - } - /* Points per wavelength */ - if (MpfArgGetDouble(&argc, argv, 1, "-ptsperlambda", &ptsPerLambda)) { - if (lambda!=-1.) - SETERRQ(1, "Can not use both -lambda and -ptsPerLambda.") ; - printf("Reading ptsPerLambda = %f\n", ptsPerLambda) ; - } - /* Setting lambda it it is not given by the user */ - if (lambda==-1.) { - ierr = getMeshStep(&step) ; - lambda = ptsPerLambda*step ; - printf(" Setting lambda = %f (with %f points per wavelength)\n", lambda, ptsPerLambda) ; - } + ierr = getMeshStep(&step) ; + lambda = 10.*step ; + printf(" Setting lambda = %f (with 10 points per wavelength)\n", lambda) ; /* --- Choix de l'arithmetique de calcul (default is '-z') --- */ if (MpfArgHasName(&argc, argv, 1, "-s") > 0) { diff --git a/src/prepareTEST.c b/src/prepareTEST.c index 1ac5ba1e432c0925044854a374dcf85db254b2a1..c67d5f96d9a629eed9b66d71075aa8a84eca1119 100644 --- a/src/prepareTEST.c +++ b/src/prepareTEST.c @@ -13,7 +13,6 @@ int prepareTEST(void) { printf("<PERFTESTS> StepMesh = %e\n" , step); printf("<PERFTESTS> NbPts = %d \n", nbPts); printf("<PERFTESTS> NbRhs = %d \n", nbRHS); - printf("<PERFTESTS> nbPtLambda = %e \n", ptsPerLambda); printf("<PERFTESTS> Lambda = %e \n", lambda); /* Cree le second membre du produit mat-vec */