diff --git a/include/main.h b/include/main.h index 85d12efa11ffeb6ca35c61a835e964a332bfea88..cab02c39af7d9390c00c676b0b9424ce651037e4 100644 --- a/include/main.h +++ b/include/main.h @@ -45,12 +45,6 @@ extern ScalarType stype; /*! \brief Wavelength (for oscillatory kernels). */ extern double lambda; -/*! \brief Flag to use HODLR storage and algorithms (default is 0). - - It can be changed with "--hodlr" (read in readFlagsTestHMAT() in hmat.c) -*/ -extern int use_hodlr; - /*! \brief User context for building MPF matrices and vectors in testMPF */ typedef struct { /*! \brief Pointer on the data used to assembly Mat/vec with computeDenseBlockRHS() */ @@ -109,7 +103,6 @@ void computeDenseBlockFEMBEM_Cprec(int *LigInf, int *LigSup, int *ColInf, int *C void prepare_hmat(int, int, int, int, int*, int*, int*, int*, void*, hmat_block_info_t *); void advanced_compute_hmat(struct hmat_block_compute_context_t*); int init_hmat_interface() ; -int readFlagsTestHMAT(int *argc, char ***argv) ; #ifdef HAVE_HMAT struct HMAT_desc_s; diff --git a/src/hmat.c b/src/hmat.c index 4a0e89bde384d4bd9d8ea50b5503e0f4222ddb1d..941365e2984d878d5969e0638a44360f275feeeb 100644 --- a/src/hmat.c +++ b/src/hmat.c @@ -19,16 +19,6 @@ int init_hmat_interface() { return 0; } -int readFlagsTestHMAT(int *argc, char ***argv) { - /* Flag to use HODLR storage and algorithms */ - if (MpfArgHasName(argc, *argv, 1, "--hodlr")) { - use_hodlr=1; - printf("Using HODLR\n") ; - } - - return 0; -} - /* Simple assembly function, as needed by hmat */ void interactionKernel(void* user_context, int i, int j, void* result) { int ierr; @@ -349,14 +339,11 @@ HMAT_desc_t *HMAT_generate_matrix( hmat_interface_t *hi ) { /* Create the H-matrix with this cluster tree and an admissibility criteria */ hmat_admissibility_t *admissibilityCondition; - if (use_hodlr) - admissibilityCondition = hmat_create_admissibility_hodlr(); - else { - hmat_admissibility_param_t admissibility_param; - hmat_init_admissibility_param(&admissibility_param); - admissibility_param.eta = 3.0; - admissibilityCondition = hmat_create_admissibility(&admissibility_param); - } + + hmat_admissibility_param_t admissibility_param; + hmat_init_admissibility_param(&admissibility_param); + admissibility_param.eta = 3.0; + admissibilityCondition = hmat_create_admissibility(&admissibility_param); // hmat_admissibility_t *admissibilityCondition = hmat_create_admissibility_standard(3.0); hmat_matrix_t* hmatrix = hi->create_empty_hmatrix_admissibility(cluster_tree, cluster_tree, 1, admissibilityCondition); diff --git a/src/main.c b/src/main.c index a420a57e56e637a2e512f69f1907bc4f8420f612..315803289d1ed9fef99f1ebe5106056f89800989 100644 --- a/src/main.c +++ b/src/main.c @@ -19,7 +19,6 @@ int simplePrec = 0; int complexALGO = 1; ScalarType stype = DOUBLE_COMPLEX; double lambda; -int use_hodlr = 0; /*! \brief Main routine \return 0 for success @@ -39,8 +38,6 @@ int main(int argc, char **argv) { /* ------------------------------------------------------------------------- */ ierr=SCAB_Init(&argc, &argv) ; CHKERRQ(ierr) ; - - ierr=readFlagsTestHMAT(&argc, &argv) ; CHKERRQ(ierr) ; ierr = init_hmat_interface(); CHKERRQ(ierr); /* ------------------------------------------------------------------------- */ diff --git a/src/testHMAT.c b/src/testHMAT.c index 747042781a62b278207ee44d6cbb8412ec1039a2..b61febed96f66897373bd621495cb89694b594fe 100644 --- a/src/testHMAT.c +++ b/src/testHMAT.c @@ -32,12 +32,8 @@ int testHMAT(double * relative_error) { // hmat_factorization_none mean the user did not chose a factorization so we // must choose one for him if(mpf_hmat_settings.factorization_type == hmat_factorization_none) { - if (use_hodlr) { - mpf_hmat_settings.factorization_type = hmat_factorization_hodlrsym; - } else { - // use LDLT for real matrices - mpf_hmat_settings.factorization_type = complexALGO ? hmat_factorization_llt : hmat_factorization_ldlt; - } + // use LDLT for real matrices + mpf_hmat_settings.factorization_type = complexALGO ? hmat_factorization_llt : hmat_factorization_ldlt; } HMAT_desc_t *hdesc;