diff --git a/opm/core/pressure/legacy_well.h b/opm/core/pressure/legacy_well.h index ccf93089b..39f402013 100644 --- a/opm/core/pressure/legacy_well.h +++ b/opm/core/pressure/legacy_well.h @@ -87,48 +87,6 @@ typedef struct LegacyWellCompletions well_t; */ typedef struct LegacyWellControls well_control_t; -/** - * Allocate cell-to-well mapping (as a sparse array). - * - * @param[in] nc Total number of cells. - * @param[in] W Well topology (well-to-cell mapping). - * @param[out] cwpos Indirection array. Points to array of size - * nc + 1 if successful. - * @param[out] cwells Cell-to-well mapping. Points to array - * of size W->well_connpos[ - * W->number_of_wells] if successful. - * @return Positive number (size of *cwells) - * if successful. Zero in case of allocation failure. - */ -int -allocate_cell_wells(int nc, well_t *W, int **cwpos, int **cwells); - -/** - * Dispose of memory resources allocated using function - * allocate_cell_wells(). - * - * Following a call to deallocate_cell_wells(), the input pointers - * are no longer valid. - * - * @param[in,out] cvpos Cell-to-well start pointers. - * @param[in,out] cwells Cell-to-well mapping. - */ -void -deallocate_cell_wells(int *cvpos, int *cwells); - -/** - * Construct cell-to-well mapping (i.e., transpose the - * well-to-cell mapping represented by W->well_cells). - * - * @param[in] nc Total number of cells. - * @param[in] W Well topology (well-to-cell mapping). - * @param[out] cwpos Cell-to-well start pointers. - * @param[out] cwells Cell-to-well mapping. - */ -void -derive_cell_wells(int nc, well_t *W, int *cwpos, int *cwells); - - #ifdef __cplusplus } #endif diff --git a/opm/core/pressure/tpfa/compr_quant_general.h b/opm/core/pressure/tpfa/compr_quant_general.h index 7027ee399..b74d09b89 100644 --- a/opm/core/pressure/tpfa/compr_quant_general.h +++ b/opm/core/pressure/tpfa/compr_quant_general.h @@ -91,43 +91,6 @@ struct compr_quantities_gen { double *voldiscr; }; - -/** - * Create management structure capable of storing derived fluid quantities - * pertaining to a reservoir model of a particular size. - * - * The resources acquired using function compr_quantities_gen_allocate() must - * be released using the destructor function compr_quantities_gen_deallocate(). - * - * @param[in] nc Number of grid cells - * @param[in] nf Number of grid interfaces - * @param[in] np Number of fluid phases (and components) - * - * @return Fully formed management structure. Returns @c NULL in case of - * allocation failure. - */ -struct compr_quantities_gen * -compr_quantities_gen_allocate(size_t nc, size_t nf, int np); - - -/** - * Release resources acquired in a previous call to constructor function - * compr_quantities_gen_allocate(). - * - * Note that - * - * compr_quantities_gen_deallocate(NULL) - * - * is supported and benign (i.e., this statement behaves as - * free(NULL)). - * - * @param[in,out] cq On input - compressible quantity management structure - * obtained through a previous call to construction function - * compr_quantities_gen_allocate(). On output - invalid pointer. - */ -void -compr_quantities_gen_deallocate(struct compr_quantities_gen *cq); - #ifdef __cplusplus } #endif diff --git a/opm/core/pressure/tpfa/compr_source.h b/opm/core/pressure/tpfa/compr_source.h index 9beb09644..37b05df30 100644 --- a/opm/core/pressure/tpfa/compr_source.h +++ b/opm/core/pressure/tpfa/compr_source.h @@ -90,78 +90,6 @@ struct compr_src { double *saturation; }; - -/** - * Create a management structure that is, initially, capable of storing a - * specified number of sources defined by a particular number a fluid phases. - * - * @param[in] np Number of fluid phases. Must be positive to actually - * allocate any sources. - * @param[in] nsrc Initial management capacity. If positive, attempt to - * allocate that number of source terms. Otherwise, the - * initial capacity is treated as (and set to) zero. - * @return Fully formed management structure if np > 0 and - * allocation success. @c NULL otherwise. The resources must be released using - * destructor function compr_src_deallocate(). - */ -struct compr_src * -compr_src_allocate(int np, int nsrc); - - -/** - * Release memory resources acquired in a previous call to constructor function - * compr_src_allocate() and, possibly, source term insertion function - * append_compr_source_term(). - * - * @param[in,out] src On input - source term management structure obtained - * through a previous call to construction function compr_src_allocate(). - * On output - invalid pointer. - */ -void -compr_src_deallocate(struct compr_src *src); - - -/** - * Insert a new explicit source term into an existing collection. - * - * @param[in] c Cell influenced by this source term. - * @param[in] np Number of fluid phases. Used for consistency checking - * only. - * @param[in] v Source term total reservoir volume Darcy flux. Positive - * if the source term is to be interpreted as an injection - * source and negative otherwise. - * @param[in] sat Injection composition for this source term. Array of size - * @c np. Copied to internal storage, but the actual numbers - * are not inspected unless v > 0.0. - * @param[in,out] src On input - source term management structure obtained - * through a previous call to construction function compr_src_allocate() and, - * possibly, another call to function append_compr_source_term(). On output - - * source term collection that includes the new source term if successful and - * unchanged if not. - * - * @return One (1, true) if successful (i.e., if the new source term could be - * included in the existing collection) and zero (0, false) if not. - */ -int -append_compr_source_term(int c , - int np , - double v , - const double *sat, - struct compr_src *src); - - -/** - * Empty source term collection while maintaining existing capacity. - * - * @param[in,out] src On input - an existing source term collection with a - * given number of sources and source capacity. On output - an empty source - * term collection (i.e., src->nsrc == 0) with an unchanged - * capacity. - */ -void -clear_compr_source_term(struct compr_src *src); - - #ifdef __cplusplus } #endif