Commit 55c0a907 authored by Cedrick Ansorge's avatar Cedrick Ansorge
Browse files

enhanced verbosity for environmental settings

parent 9eaaeada
......@@ -117,8 +117,15 @@ void *EOFs(void * argument)
cdoWarning("Unknown environmental setting %s for CDO_SVD_MODE. Available options are",envstr);
cdoWarning(" - 'jacobi' for a one-sided parallelized jacobi algorithm");
cdoWarning(" - 'danielson_lanzcos' for the D/L algorithm");
envstr=NULL;
}
if ( cdoVerbose )
cdoPrint("Using CDO_SVD_MODE '%s' from %s",
eigen_mode==JACOBI?"jacobi":"danielson_lanczos",
envstr?"Environment":" default");
streamID1 = streamOpenRead(cdoStreamName(0));
if ( streamID1 < 0 ) cdiError(streamID1, "Open failed on %s", cdoStreamName(0));
vlistID1 = streamInqVlist(streamID1);
......
......@@ -1249,26 +1249,29 @@ double fisher(double m, double n, double x, const char *prompt)
void parallel_eigen_solution_of_symmetric_matrix(double **M, double *A, int n1, int n2, const char func[])
{
func = "statistics-module";
char *envstr;
/* Get Environment variables if set */
envstr = getenv("MAX_JACOBI_ITER");
if ( envstr ) {
if ( envstr )
max_jacobi_iter = atoi(envstr);
if ( cdoVerbose )
cdoPrint("Got environmental setting from MAX_JACOBI_ITER: %i",max_jacobi_iter);
}
else
max_jacobi_iter = MAX_JACOBI_ITER;
if ( cdoVerbose )
cdoPrint("Using MAX_JACOBI_ITER %i from %s",
max_jacobi_iter, envstr?"Environment":"default");
envstr = getenv("FNORM_PRECISION");
if ( envstr ) {
if ( envstr )
fnorm_precision = strtod(envstr,NULL);
if ( cdoVerbose )
cdoPrint("Got environmental setting from FNORM_PRECISION: %10.6f",fnorm_precision);
}
else
fnorm_precision = FNORM_PRECISION;
if ( cdoVerbose )
cdoPrint("Using FNORM_PRECISION %g from %s",
fnorm_precision,envstr?"Environment":"default");
if ( n1 != n2 )
{
......@@ -1297,7 +1300,7 @@ void annihilate_1side(double **M, int i, int j, int k, int n)
double tk, ck, sk, alpha=0, beta=0, gamma=0, zeta=0;
double tmp, *mi=NULL, *mj=NULL;
int first_annihilation = 0;
// int first_annihilation = 0;
int r;
i--; j--;
......
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