Skip to content

Commit 8f8e3a6

Browse files
jeremyltjeremylt
committed
internal - naming consistenc
1 parent dba527d commit 8f8e3a6

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

‎interface/ceed-preconditioning.c‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ static int CeedOperatorCreateFallback(CeedOperator op) {
213213
214214
@ref Developer
215215
**/
216-
static inline int CeedSingleOperatorLinearAssembleAddDiagonal_Mesh(CeedOperator op, CeedRequest *request, const bool is_point_block,
216+
static inline int CeedOperatorLinearAssembleAddDiagonalSingle_Mesh(CeedOperator op, CeedRequest *request, const bool is_point_block,
217217
CeedVector assembled) {
218218
bool is_composite;
219219

@@ -398,13 +398,13 @@ static inline int CeedSingleOperatorLinearAssembleAddDiagonal_Mesh(CeedOperator
398398
399399
@ref Developer
400400
**/
401-
static inline int CeedSingleOperatorLinearAssembleAddDiagonal(CeedOperator op, CeedRequest *request, const bool is_point_block,
401+
static inline int CeedOperatorLinearAssembleAddDiagonalSingle(CeedOperator op, CeedRequest *request, const bool is_point_block,
402402
CeedVector assembled) {
403403
bool is_at_points;
404404

405405
CeedCall(CeedOperatorIsAtPoints(op, &is_at_points));
406406
CeedCheck(!is_at_points, CeedOperatorReturnCeed(op), CEED_ERROR_UNSUPPORTED, "AtPoints operator not supported");
407-
CeedCall(CeedSingleOperatorLinearAssembleAddDiagonal_Mesh(op, request, is_point_block, assembled));
407+
CeedCall(CeedOperatorLinearAssembleAddDiagonalSingle_Mesh(op, request, is_point_block, assembled));
408408
return CEED_ERROR_SUCCESS;
409409
}
410410

@@ -420,7 +420,7 @@ static inline int CeedSingleOperatorLinearAssembleAddDiagonal(CeedOperator op, C
420420
421421
@ref Developer
422422
**/
423-
static inline int CeedCompositeOperatorLinearAssembleAddDiagonal(CeedOperator op, CeedRequest *request, const bool is_point_block,
423+
static inline int CeedOperatorLinearAssembleAddDiagonalComposite(CeedOperator op, CeedRequest *request, const bool is_point_block,
424424
CeedVector assembled) {
425425
CeedInt num_sub;
426426
CeedOperator *suboperators;
@@ -451,7 +451,7 @@ static inline int CeedCompositeOperatorLinearAssembleAddDiagonal(CeedOperator op
451451
452452
@ref Developer
453453
**/
454-
static int CeedSingleOperatorAssembleSymbolic(CeedOperator op, CeedInt offset, CeedInt *rows, CeedInt *cols) {
454+
static int CeedOperatorAssembleSymbolicSingle(CeedOperator op, CeedInt offset, CeedInt *rows, CeedInt *cols) {
455455
Ceed ceed;
456456
bool is_composite;
457457
CeedSize num_nodes_in, num_nodes_out, local_num_entries, count = 0;
@@ -650,7 +650,7 @@ static int CeedOperatorLinearAssembleQFunctionBuildOrUpdate_Core(CeedOperator op
650650
651651
@ref Developer
652652
**/
653-
int CeedOperatorFallbackLinearAssembleQFunctionBuildOrUpdate(CeedOperator op, CeedVector *assembled, CeedElemRestriction *rstr,
653+
int CeedOperatorLinearAssembleQFunctionBuildOrUpdateFallback(CeedOperator op, CeedVector *assembled, CeedElemRestriction *rstr,
654654
CeedRequest *request) {
655655
return CeedOperatorLinearAssembleQFunctionBuildOrUpdate_Core(op, false, assembled, rstr, request);
656656
}
@@ -668,7 +668,7 @@ int CeedOperatorFallbackLinearAssembleQFunctionBuildOrUpdate(CeedOperator op, Ce
668668
669669
@ref Developer
670670
**/
671-
int CeedSingleOperatorAssemble(CeedOperator op, CeedInt offset, CeedVector values) {
671+
int CeedOperatorAssembleSingle(CeedOperator op, CeedInt offset, CeedVector values) {
672672
bool is_composite, is_at_points;
673673

674674
CeedCall(CeedOperatorIsComposite(op, &is_composite));
@@ -690,10 +690,10 @@ int CeedSingleOperatorAssemble(CeedOperator op, CeedInt offset, CeedVector value
690690
// Operator fallback
691691
CeedOperator op_fallback;
692692

693-
CeedDebug(CeedOperatorReturnCeed(op), "\nFalling back for CeedSingleOperatorAssemble\n");
693+
CeedDebug(CeedOperatorReturnCeed(op), "\nFalling back for CeedOperatorAssembleSingle\n");
694694
CeedCall(CeedOperatorGetFallback(op, &op_fallback));
695695
if (op_fallback) {
696-
CeedCall(CeedSingleOperatorAssemble(op_fallback, offset, values));
696+
CeedCall(CeedOperatorAssembleSingle(op_fallback, offset, values));
697697
return CEED_ERROR_SUCCESS;
698698
}
699699
}
@@ -925,7 +925,7 @@ int CeedSingleOperatorAssemble(CeedOperator op, CeedInt offset, CeedVector value
925925
926926
@ref Utility
927927
**/
928-
static int CeedSingleOperatorAssemblyCountEntries(CeedOperator op, CeedSize *num_entries) {
928+
static int CeedOperatorAssemblyCountEntriesSingle(CeedOperator op, CeedSize *num_entries) {
929929
bool is_composite;
930930
CeedInt num_elem_in, elem_size_in, num_comp_in, num_elem_out, elem_size_out, num_comp_out;
931931
CeedElemRestriction rstr_in, rstr_out;
@@ -972,7 +972,7 @@ static int CeedSingleOperatorAssemblyCountEntries(CeedOperator op, CeedSize *num
972972
973973
@ref Developer
974974
**/
975-
static int CeedSingleOperatorMultigridLevel(CeedOperator op_fine, CeedVector p_mult_fine, CeedElemRestriction rstr_coarse, CeedBasis basis_coarse,
975+
static int CeedOperatorMultigridLevelCreateSingle_Core(CeedOperator op_fine, CeedVector p_mult_fine, CeedElemRestriction rstr_coarse, CeedBasis basis_coarse,
976976
CeedBasis basis_c_to_f, CeedOperator *op_coarse, CeedOperator *op_prolong, CeedOperator *op_restrict) {
977977
bool is_composite;
978978
Ceed ceed;
@@ -2107,7 +2107,7 @@ int CeedOperatorLinearAssembleDiagonal(CeedOperator op, CeedVector assembled, Ce
21072107
} else if (is_composite) {
21082108
// Default to summing contributions of suboperators
21092109
CeedCall(CeedVectorSetValue(assembled, 0.0));
2110-
CeedCall(CeedCompositeOperatorLinearAssembleAddDiagonal(op, request, false, assembled));
2110+
CeedCall(CeedOperatorLinearAssembleAddDiagonalComposite(op, request, false, assembled));
21112111
return CEED_ERROR_SUCCESS;
21122112
} else {
21132113
// Operator fallback
@@ -2167,7 +2167,7 @@ int CeedOperatorLinearAssembleAddDiagonal(CeedOperator op, CeedVector assembled,
21672167
return CEED_ERROR_SUCCESS;
21682168
} else if (is_composite) {
21692169
// Default to summing contributions of suboperators
2170-
CeedCall(CeedCompositeOperatorLinearAssembleAddDiagonal(op, request, false, assembled));
2170+
CeedCall(CeedOperatorLinearAssembleAddDiagonalComposite(op, request, false, assembled));
21712171
return CEED_ERROR_SUCCESS;
21722172
} else {
21732173
// Operator fallback
@@ -2181,7 +2181,7 @@ int CeedOperatorLinearAssembleAddDiagonal(CeedOperator op, CeedVector assembled,
21812181
}
21822182
}
21832183
// Default interface implementation
2184-
CeedCall(CeedSingleOperatorLinearAssembleAddDiagonal(op, request, false, assembled));
2184+
CeedCall(CeedOperatorLinearAssembleAddDiagonalSingle(op, request, false, assembled));
21852185
return CEED_ERROR_SUCCESS;
21862186
}
21872187

@@ -2406,9 +2406,9 @@ int CeedOperatorLinearAssembleAddPointBlockDiagonal(CeedOperator op, CeedVector
24062406
}
24072407
// Default interface implementation
24082408
if (is_composite) {
2409-
CeedCall(CeedCompositeOperatorLinearAssembleAddDiagonal(op, request, true, assembled));
2409+
CeedCall(CeedOperatorLinearAssembleAddDiagonalComposite(op, request, true, assembled));
24102410
} else {
2411-
CeedCall(CeedSingleOperatorLinearAssembleAddDiagonal(op, request, true, assembled));
2411+
CeedCall(CeedOperatorLinearAssembleAddDiagonalSingle(op, request, true, assembled));
24122412
}
24132413
return CEED_ERROR_SUCCESS;
24142414
}
@@ -2466,11 +2466,11 @@ int CeedOperatorLinearAssembleSymbolic(CeedOperator op, CeedSize *num_entries, C
24662466
CeedCall(CeedCompositeOperatorGetNumSub(op, &num_suboperators));
24672467
CeedCall(CeedCompositeOperatorGetSubList(op, &sub_operators));
24682468
for (CeedInt k = 0; k < num_suboperators; ++k) {
2469-
CeedCall(CeedSingleOperatorAssemblyCountEntries(sub_operators[k], &single_entries));
2469+
CeedCall(CeedOperatorAssemblyCountEntriesSingle(sub_operators[k], &single_entries));
24702470
*num_entries += single_entries;
24712471
}
24722472
} else {
2473-
CeedCall(CeedSingleOperatorAssemblyCountEntries(op, &single_entries));
2473+
CeedCall(CeedOperatorAssemblyCountEntriesSingle(op, &single_entries));
24742474
*num_entries += single_entries;
24752475
}
24762476
CeedCall(CeedCalloc(*num_entries, rows));
@@ -2481,12 +2481,12 @@ int CeedOperatorLinearAssembleSymbolic(CeedOperator op, CeedSize *num_entries, C
24812481
CeedCall(CeedCompositeOperatorGetNumSub(op, &num_suboperators));
24822482
CeedCall(CeedCompositeOperatorGetSubList(op, &sub_operators));
24832483
for (CeedInt k = 0; k < num_suboperators; ++k) {
2484-
CeedCall(CeedSingleOperatorAssembleSymbolic(sub_operators[k], offset, *rows, *cols));
2485-
CeedCall(CeedSingleOperatorAssemblyCountEntries(sub_operators[k], &single_entries));
2484+
CeedCall(CeedOperatorAssembleSymbolicSingle(sub_operators[k], offset, *rows, *cols));
2485+
CeedCall(CeedOperatorAssemblyCountEntriesSingle(sub_operators[k], &single_entries));
24862486
offset += single_entries;
24872487
}
24882488
} else {
2489-
CeedCall(CeedSingleOperatorAssembleSymbolic(op, offset, *rows, *cols));
2489+
CeedCall(CeedOperatorAssembleSymbolicSingle(op, offset, *rows, *cols));
24902490
}
24912491
return CEED_ERROR_SUCCESS;
24922492
}
@@ -2536,14 +2536,14 @@ int CeedOperatorLinearAssemble(CeedOperator op, CeedVector values) {
25362536
CeedCall(CeedCompositeOperatorGetNumSub(op, &num_suboperators));
25372537
CeedCall(CeedCompositeOperatorGetSubList(op, &sub_operators));
25382538
for (CeedInt k = 0; k < num_suboperators; k++) {
2539-
CeedCall(CeedSingleOperatorAssemble(sub_operators[k], offset, values));
2540-
CeedCall(CeedSingleOperatorAssemblyCountEntries(sub_operators[k], &single_entries));
2539+
CeedCall(CeedOperatorAssembleSingle(sub_operators[k], offset, values));
2540+
CeedCall(CeedOperatorAssemblyCountEntriesSingle(sub_operators[k], &single_entries));
25412541
offset += single_entries;
25422542
}
25432543
return CEED_ERROR_SUCCESS;
25442544
} else if (op->LinearAssembleSingle) {
25452545
CeedCall(CeedVectorSetValue(values, 0.0));
2546-
CeedCall(CeedSingleOperatorAssemble(op, offset, values));
2546+
CeedCall(CeedOperatorAssembleSingle(op, offset, values));
25472547
return CEED_ERROR_SUCCESS;
25482548
} else {
25492549
// Operator fallback
@@ -2559,7 +2559,7 @@ int CeedOperatorLinearAssemble(CeedOperator op, CeedVector values) {
25592559

25602560
// Default to interface version if non-composite and no fallback
25612561
CeedCall(CeedVectorSetValue(values, 0.0));
2562-
CeedCall(CeedSingleOperatorAssemble(op, offset, values));
2562+
CeedCall(CeedOperatorAssembleSingle(op, offset, values));
25632563
return CEED_ERROR_SUCCESS;
25642564
}
25652565

@@ -2670,7 +2670,7 @@ int CeedOperatorMultigridLevelCreate(CeedOperator op_fine, CeedVector p_mult_fin
26702670
}
26712671

26722672
// Core code
2673-
CeedCall(CeedSingleOperatorMultigridLevel(op_fine, p_mult_fine, rstr_coarse, basis_coarse, basis_c_to_f, op_coarse, op_prolong, op_restrict));
2673+
CeedCall(CeedOperatorMultigridLevelCreateSingle_Core(op_fine, p_mult_fine, rstr_coarse, basis_coarse, basis_c_to_f, op_coarse, op_prolong, op_restrict));
26742674
return CEED_ERROR_SUCCESS;
26752675
}
26762676

@@ -2735,7 +2735,7 @@ int CeedOperatorMultigridLevelCreateTensorH1(CeedOperator op_fine, CeedVector p_
27352735
}
27362736

27372737
// Core code
2738-
CeedCall(CeedSingleOperatorMultigridLevel(op_fine, p_mult_fine, rstr_coarse, basis_coarse, basis_c_to_f, op_coarse, op_prolong, op_restrict));
2738+
CeedCall(CeedOperatorMultigridLevelCreateSingle_Core(op_fine, p_mult_fine, rstr_coarse, basis_coarse, basis_c_to_f, op_coarse, op_prolong, op_restrict));
27392739
CeedCall(CeedDestroy(&ceed));
27402740
return CEED_ERROR_SUCCESS;
27412741
}
@@ -2799,7 +2799,7 @@ int CeedOperatorMultigridLevelCreateH1(CeedOperator op_fine, CeedVector p_mult_f
27992799
}
28002800

28012801
// Core code
2802-
CeedCall(CeedSingleOperatorMultigridLevel(op_fine, p_mult_fine, rstr_coarse, basis_coarse, basis_c_to_f, op_coarse, op_prolong, op_restrict));
2802+
CeedCall(CeedOperatorMultigridLevelCreateSingle_Core(op_fine, p_mult_fine, rstr_coarse, basis_coarse, basis_c_to_f, op_coarse, op_prolong, op_restrict));
28032803
CeedCall(CeedDestroy(&ceed));
28042804
return CEED_ERROR_SUCCESS;
28052805
}

0 commit comments

Comments
 (0)