From 6ccb3eb0f2581c5e17df1c63e9034d83e8f065d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?FEL=C5=A0=C3=96CI=20Marek?= <marek.felsoci@inria.fr>
Date: Sun, 5 Nov 2023 18:00:18 +0100
Subject: [PATCH] Use fixed wavelength
---
include/main.h | 3 ---
src/main.c | 23 ++++-------------------
src/prepareTEST.c | 1 -
3 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/include/main.h b/include/main.h
index 6dbaa7e..cb36859 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 93e30eb..a8a11a2 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 1ac5ba1..c67d5f9 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 */
--
GitLab