Skip to content

Commit 85878ce

Browse files
committed
Construct linalg matrix with enum
1 parent 6109179 commit 85878ce

File tree

366 files changed

+7099
-6076
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

366 files changed

+7099
-6076
lines changed

src/ale/4C_ale_ale2_evaluate.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,12 +1139,12 @@ void Discret::Elements::Ale2::material_response3d_plane(Core::LinAlg::SerialDens
11391139
Teuchos::ParameterList& params, const int gp)
11401140
{
11411141
// make 3d equivalent of Green-Lagrange strain
1142-
Core::LinAlg::Matrix<6, 1> gl(false);
1142+
Core::LinAlg::Matrix<6, 1> gl(Core::LinAlg::Initialization::uninitialized);
11431143
green_lagrange_plane3d(strain, gl);
11441144

11451145
// call 3d stress response
1146-
Core::LinAlg::Matrix<6, 1> pk2(true); // must be zerofied!!!
1147-
Core::LinAlg::Matrix<6, 6> cmat(true); // must be zerofied!!!
1146+
Core::LinAlg::Matrix<6, 1> pk2(Core::LinAlg::Initialization::zero); // must be zerofied!!!
1147+
Core::LinAlg::Matrix<6, 6> cmat(Core::LinAlg::Initialization::zero); // must be zerofied!!!
11481148
material_response3d(&pk2, &cmat, &gl, params, gp);
11491149

11501150
// we have plain strain

src/ale/4C_ale_ale3_evaluate.cpp

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,7 @@ void Discret::Elements::Ale3Impl<distype>::static_ke_nonlinear(Ale3* ele,
13771377
// --------------------------------------------------
13781378
// Now do the nurbs specific stuff
13791379
std::vector<Core::LinAlg::SerialDenseVector> myknots;
1380-
Core::LinAlg::Matrix<iel, 1> weights(iel);
1380+
Core::LinAlg::Matrix<iel, 1> weights;
13811381

13821382
if (distype == Core::FE::CellType::nurbs8 || distype == Core::FE::CellType::nurbs27)
13831383
{
@@ -1406,7 +1406,7 @@ void Discret::Elements::Ale3Impl<distype>::static_ke_nonlinear(Ale3* ele,
14061406
Core::LinAlg::Matrix<3, 3> xjm;
14071407
Core::LinAlg::Matrix<3, 3> xji;
14081408
Core::LinAlg::Matrix<6, numdof> bop;
1409-
Core::LinAlg::Matrix<6, 6> D(true);
1409+
Core::LinAlg::Matrix<6, 6> D(Core::LinAlg::Initialization::zero);
14101410
// gaussian points
14111411
const Core::FE::GaussRule3D gaussrule = get_optimal_gaussrule();
14121412
const Core::FE::IntegrationPoints3D intpoints(gaussrule);
@@ -1518,8 +1518,9 @@ void Discret::Elements::Ale3Impl<distype>::static_ke_nonlinear(Ale3* ele,
15181518
bop(5, NODDOF_ALE3 * i + 2) = defgrd(2, 2) * N_XYZ(0, i) + defgrd(2, 0) * N_XYZ(2, i);
15191519
}
15201520
// call material law cccccccccccccccccccccccccccccccccccccccccccccccccccccc
1521-
Core::LinAlg::Matrix<Mat::NUM_STRESS_3D, Mat::NUM_STRESS_3D> cmat_f(true);
1522-
Core::LinAlg::Matrix<Mat::NUM_STRESS_3D, 1> stress_f(true);
1521+
Core::LinAlg::Matrix<Mat::NUM_STRESS_3D, Mat::NUM_STRESS_3D> cmat_f(
1522+
Core::LinAlg::Initialization::zero);
1523+
Core::LinAlg::Matrix<Mat::NUM_STRESS_3D, 1> stress_f(Core::LinAlg::Initialization::zero);
15231524
Core::LinAlg::Matrix<Mat::NUM_STRESS_3D, 1> glstrain_f(glstrain.data());
15241525
// QUICK HACK until so_disp exclusively uses Core::LinAlg::Matrix!!!!!
15251526
Core::LinAlg::Matrix<NUMDIM_ALE3, NUMDIM_ALE3> fixed_defgrd(defgrd);
@@ -1612,7 +1613,7 @@ void Discret::Elements::Ale3Impl<distype>::static_ke_laplace(Ale3* ele,
16121613
// --------------------------------------------------
16131614
// Now do the nurbs specific stuff
16141615
std::vector<Core::LinAlg::SerialDenseVector> myknots(3);
1615-
Core::LinAlg::Matrix<iel, 1> weights(iel);
1616+
Core::LinAlg::Matrix<iel, 1> weights;
16161617

16171618
if (distype == Core::FE::CellType::nurbs8 or distype == Core::FE::CellType::nurbs27)
16181619
{
@@ -1633,13 +1634,13 @@ void Discret::Elements::Ale3Impl<distype>::static_ke_laplace(Ale3* ele,
16331634
}
16341635

16351636
/*----------------------------------------- declaration of variables ---*/
1636-
Core::LinAlg::Matrix<iel, 1> funct(true);
1637-
Core::LinAlg::Matrix<3, iel> deriv(true);
1638-
Core::LinAlg::Matrix<3, 3> xjm(true);
1639-
Core::LinAlg::Matrix<3, 3> xji(true);
1640-
Core::LinAlg::Matrix<3, iel> deriv_xy(true);
1641-
Core::LinAlg::Matrix<iel, iel> tempmat(true);
1642-
Core::LinAlg::Matrix<3 * iel, 1> tempmat2(true);
1637+
Core::LinAlg::Matrix<iel, 1> funct(Core::LinAlg::Initialization::zero);
1638+
Core::LinAlg::Matrix<3, iel> deriv(Core::LinAlg::Initialization::zero);
1639+
Core::LinAlg::Matrix<3, 3> xjm(Core::LinAlg::Initialization::zero);
1640+
Core::LinAlg::Matrix<3, 3> xji(Core::LinAlg::Initialization::zero);
1641+
Core::LinAlg::Matrix<3, iel> deriv_xy(Core::LinAlg::Initialization::zero);
1642+
Core::LinAlg::Matrix<iel, iel> tempmat(Core::LinAlg::Initialization::zero);
1643+
Core::LinAlg::Matrix<3 * iel, 1> tempmat2(Core::LinAlg::Initialization::zero);
16431644

16441645
// gaussian points
16451646
const Core::FE::GaussRule3D gaussrule = get_optimal_gaussrule();

src/art_net/4C_art_net_artery_ele_calc_pres_based.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ void Discret::Elements::ArteryEleCalcPresBased<distype>::sysmat(Artery* ele,
139139
if (pressnp == nullptr) FOUR_C_THROW("could not get pressure inside artery element");
140140

141141
// extract local values of pressure field from global state vector
142-
Core::LinAlg::Matrix<my::iel_, 1> mypress(true);
142+
Core::LinAlg::Matrix<my::iel_, 1> mypress(Core::LinAlg::Initialization::zero);
143143
Core::FE::extract_my_values<Core::LinAlg::Matrix<my::iel_, 1>>(*pressnp, mypress, la[0].lm_);
144144

145145
// calculate the element length
@@ -217,7 +217,7 @@ void Discret::Elements::ArteryEleCalcPresBased<distype>::evaluate_flow(Artery* e
217217
if (pressnp == nullptr) FOUR_C_THROW("could not get pressure inside artery element");
218218

219219
// extract local values of pressure field from global state vector
220-
Core::LinAlg::Matrix<my::iel_, 1> mypress(true);
220+
Core::LinAlg::Matrix<my::iel_, 1> mypress(Core::LinAlg::Initialization::zero);
221221
Core::FE::extract_my_values<Core::LinAlg::Matrix<my::iel_, 1>>(*pressnp, mypress, la[0].lm_);
222222

223223
// calculate the element length

src/beam3/4C_beam3_base.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -325,10 +325,9 @@ void Discret::Elements::Beam3Base::un_shift_node_position(
325325

326326
// loop through all nodes except for the first node which remains
327327
// fixed as reference node
328-
static Core::LinAlg::Matrix<3, 1> d(true), ref(true), X(true);
329-
d.clear();
330-
ref.clear();
331-
X.clear();
328+
static Core::LinAlg::Matrix<3, 1> d(Core::LinAlg::Initialization::zero);
329+
static Core::LinAlg::Matrix<3, 1> ref(Core::LinAlg::Initialization::zero);
330+
static Core::LinAlg::Matrix<3, 1> X(Core::LinAlg::Initialization::zero);
332331
for (unsigned int i = 1; i < nnodecl; ++i)
333332
{
334333
for (int dim = 0; dim < 3; ++dim)
@@ -365,10 +364,9 @@ void Discret::Elements::Beam3Base::get_directions_of_shifts(std::vector<double>&
365364

366365
// loop through all nodes except for the first node which remains
367366
// fixed as reference node
368-
static Core::LinAlg::Matrix<3, 1> d(true), ref(true), X(true);
369-
d.clear();
370-
ref.clear();
371-
X.clear();
367+
static Core::LinAlg::Matrix<3, 1> d(Core::LinAlg::Initialization::zero);
368+
static Core::LinAlg::Matrix<3, 1> ref(Core::LinAlg::Initialization::zero);
369+
static Core::LinAlg::Matrix<3, 1> X(Core::LinAlg::Initialization::zero);
372370
for (unsigned int i = 1; i < nnodecl; ++i)
373371
{
374372
for (int dim = 0; dim < 3; ++dim)

src/beam3/4C_beam3_base.templates.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ template <unsigned int nnode, unsigned int vpernode>
1919
double Discret::Elements::Beam3Base::calc_reflength(
2020
const Core::LinAlg::Matrix<3 * vpernode * nnode, 1, double>& disp_refe_centerline)
2121
{
22-
Core::LinAlg::Matrix<3, 1> tempvec(true);
22+
Core::LinAlg::Matrix<3, 1> tempvec(Core::LinAlg::Initialization::zero);
2323

2424
for (int dim = 0; dim < 3; dim++)
2525
tempvec(dim) = disp_refe_centerline(3 * vpernode * 1 + dim) - disp_refe_centerline(dim);

src/beam3/4C_beam3_discretization_runtime_vtu_writer.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ void BeamDiscretizationRuntimeOutputWriter::set_geometry_from_beam_discretizatio
161161

162162
/* loop over the chosen visualization points (equidistant distribution in the element
163163
* parameter space xi \in [-1,1] ) and determine their interpolated (initial) positions r */
164-
Core::LinAlg::Matrix<3, 1> interpolated_position(true);
165-
Core::LinAlg::Matrix<3, 1> interpolated_position_priorpoint(true);
164+
Core::LinAlg::Matrix<3, 1> interpolated_position(Core::LinAlg::Initialization::zero);
165+
Core::LinAlg::Matrix<3, 1> interpolated_position_priorpoint(Core::LinAlg::Initialization::zero);
166166
double xi = 0.0;
167167

168168
for (unsigned int ipoint = 0; ipoint < n_subsegments_ + 1; ++ipoint)
@@ -1357,7 +1357,7 @@ void BeamDiscretizationRuntimeOutputWriter::append_element_orientation_parameter
13571357

13581358
// length of element is approximated linearly, as also the direction of a element is calculated
13591359
// linearly independent of centerline interpolation
1360-
Core::LinAlg::Matrix<3, 1> dirvec(true);
1360+
Core::LinAlg::Matrix<3, 1> dirvec(Core::LinAlg::Initialization::zero);
13611361

13621362
std::vector<double> pos(2, 0.0);
13631363
for (int dim = 0; dim < 3; ++dim)
@@ -1375,7 +1375,7 @@ void BeamDiscretizationRuntimeOutputWriter::append_element_orientation_parameter
13751375
double curr_lin_ele_length = dirvec.norm2();
13761376

13771377
// loop over all base vectors for orientation index x,y and z
1378-
Core::LinAlg::Matrix<3, 1> unit_base_vec(true);
1378+
Core::LinAlg::Matrix<3, 1> unit_base_vec(Core::LinAlg::Initialization::zero);
13791379
std::vector<double> curr_ele_orientation_parameter(3, 0.0);
13801380
for (int unsigned ibase = 0; ibase < 3; ++ibase)
13811381
{
@@ -1454,12 +1454,12 @@ void BeamDiscretizationRuntimeOutputWriter::append_rve_crosssection_forces(
14541454
std::vector<std::vector<double>> fint_sum(3, std::vector<double>(3, 0.0));
14551455
std::vector<double> beamelement_displacement_vector;
14561456
std::vector<double> beamelement_shift_displacement_vector;
1457-
Core::LinAlg::Matrix<3, 1> pos_node_1(true);
1458-
Core::LinAlg::Matrix<3, 1> pos_node_2(true);
1457+
Core::LinAlg::Matrix<3, 1> pos_node_1(Core::LinAlg::Initialization::zero);
1458+
Core::LinAlg::Matrix<3, 1> pos_node_2(Core::LinAlg::Initialization::zero);
14591459

14601460
// create pseudo planes through center of RVE (like this it also works if
14611461
// your box is not periodic, i.e. you do not have cut element on the box edges)
1462-
Core::LinAlg::Matrix<3, 2> box(true);
1462+
Core::LinAlg::Matrix<3, 2> box(Core::LinAlg::Initialization::zero);
14631463
if (periodic_boundingbox_ != nullptr)
14641464
{
14651465
for (unsigned dim = 0; dim < 3; ++dim)
@@ -1470,7 +1470,7 @@ void BeamDiscretizationRuntimeOutputWriter::append_rve_crosssection_forces(
14701470
}
14711471
}
14721472

1473-
Core::LinAlg::Matrix<3, 1> xi_intersect(true);
1473+
Core::LinAlg::Matrix<3, 1> xi_intersect(Core::LinAlg::Initialization::zero);
14741474

14751475
// loop over all my elements and build force sum of myrank's cut element
14761476
for (unsigned int ibeamele = 0; ibeamele < num_beam_row_elements; ++ibeamele)

src/beam3/4C_beam3_euler_bernoulli.cpp

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Core::LinAlg::SerialDenseMatrix Discret::Elements::Beam3ebType::compute_null_spa
9797

9898
// Compute tangent vector with unit length from nodal coordinates.
9999
// Note: Tangent vector is the same at both nodes due to straight initial configuration.
100-
Core::LinAlg::Matrix<spacedim, 1> tangent(true);
100+
Core::LinAlg::Matrix<spacedim, 1> tangent(Core::LinAlg::Initialization::zero);
101101
{
102102
const Core::Nodes::Node* firstnode = beam3eb->nodes()[0];
103103
const Core::Nodes::Node* secondnode = beam3eb->nodes()[1];
@@ -110,11 +110,11 @@ Core::LinAlg::SerialDenseMatrix Discret::Elements::Beam3ebType::compute_null_spa
110110

111111
// Form a Cartesian basis
112112
std::array<Core::LinAlg::Matrix<spacedim, 1>, spacedim> basis;
113-
Core::LinAlg::Matrix<spacedim, 1> e1(true);
113+
Core::LinAlg::Matrix<spacedim, 1> e1(Core::LinAlg::Initialization::zero);
114114
e1(0) = 1.0;
115-
Core::LinAlg::Matrix<spacedim, 1> e2(true);
115+
Core::LinAlg::Matrix<spacedim, 1> e2(Core::LinAlg::Initialization::zero);
116116
e2(1) = 1.0;
117-
Core::LinAlg::Matrix<spacedim, 1> e3(true);
117+
Core::LinAlg::Matrix<spacedim, 1> e3(Core::LinAlg::Initialization::zero);
118118
e3(2) = 1.0;
119119
basis[0] = e1;
120120
basis[1] = e2;
@@ -148,16 +148,18 @@ Core::LinAlg::SerialDenseMatrix Discret::Elements::Beam3ebType::compute_null_spa
148148
if (std::abs(omegaTwo.dot(tangent)) > 1.0e-12)
149149
FOUR_C_THROW("omegaTwo not orthogonal to tangent vector.");
150150

151-
Core::LinAlg::Matrix<3, 1> nodeCoords(true);
151+
Core::LinAlg::Matrix<3, 1> nodeCoords(Core::LinAlg::Initialization::zero);
152152
for (std::size_t dim = 0; dim < 3; ++dim) nodeCoords(dim) = x[dim] - x0[dim];
153153

154154
// Compute rotations in displacement DOFs
155-
Core::LinAlg::Matrix<spacedim, 1> rotOne(true), rotTwo(true);
155+
Core::LinAlg::Matrix<spacedim, 1> rotOne(Core::LinAlg::Initialization::zero);
156+
Core::LinAlg::Matrix<spacedim, 1> rotTwo(Core::LinAlg::Initialization::zero);
156157
rotOne.cross_product(omegaOne, nodeCoords);
157158
rotTwo.cross_product(omegaTwo, nodeCoords);
158159

159160
// Compute rotations in tangent DOFs
160-
Core::LinAlg::Matrix<spacedim, 1> rotTangOne(true), rotTangTwo(true);
161+
Core::LinAlg::Matrix<spacedim, 1> rotTangOne(Core::LinAlg::Initialization::zero);
162+
Core::LinAlg::Matrix<spacedim, 1> rotTangTwo(Core::LinAlg::Initialization::zero);
161163
rotTangOne.cross_product(omegaOne, tangent);
162164
rotTangTwo.cross_product(omegaTwo, tangent);
163165

@@ -285,10 +287,10 @@ Discret::Elements::Beam3eb::Beam3eb(int id, int owner)
285287
firstcall_(true),
286288
ekin_(0.0),
287289
eint_(0.0),
288-
l_(Core::LinAlg::Matrix<3, 1>(true)),
289-
p_(Core::LinAlg::Matrix<3, 1>(true)),
290-
t0_(Core::LinAlg::Matrix<3, 2>(true)),
291-
t_(Core::LinAlg::Matrix<3, 2>(true)),
290+
l_(Core::LinAlg::Matrix<3, 1>(Core::LinAlg::Initialization::zero)),
291+
p_(Core::LinAlg::Matrix<3, 1>(Core::LinAlg::Initialization::zero)),
292+
t0_(Core::LinAlg::Matrix<3, 2>(Core::LinAlg::Initialization::zero)),
293+
t_(Core::LinAlg::Matrix<3, 2>(Core::LinAlg::Initialization::zero)),
292294
kappa_max_(0.0),
293295
epsilon_max_(0.0),
294296
axial_strain_gp_(0),
@@ -535,7 +537,7 @@ void Discret::Elements::Beam3eb::get_pos_at_xi(
535537
disp.size());
536538

537539
// add reference positions and tangents => total Lagrangean state vector
538-
Core::LinAlg::Matrix<12, 1> disp_totlag(true);
540+
Core::LinAlg::Matrix<12, 1> disp_totlag(Core::LinAlg::Initialization::zero);
539541
update_disp_totlag<2, 6>(disp, disp_totlag);
540542

541543
Beam3Base::get_pos_at_xi<2, 2, double>(pos, xi, disp_totlag);
@@ -553,7 +555,7 @@ void Discret::Elements::Beam3eb::get_triad_at_xi(
553555
disp.size());
554556

555557
// add reference positions and tangents => total Lagrangean state vector
556-
Core::LinAlg::Matrix<12, 1> disp_totlag(true);
558+
Core::LinAlg::Matrix<12, 1> disp_totlag(Core::LinAlg::Initialization::zero);
557559
update_disp_totlag<2, 6>(disp, disp_totlag);
558560

559561
triad.clear();

0 commit comments

Comments
 (0)