before branch

src/ThermoelasticTop3d.h

@@ -129,10 +129,7 @@ namespace da::sha::top {
                 // solve T
 
                 Eigen::VectorXd sK_th =
-                        (sp_thermal_top3d_->sKe_ * (lambda_min +
-                                                    xPhys_col.array() /
-                                                    (1.0 + sp_para_->R_lambda * (1.0 - xPhys_col.array())) *
-                                                    (lambda0 - lambda_min)).matrix().transpose())
+                        (sp_thermal_top3d_->sKe_ * CalLambda_Vec(xPhys_col).transpose())
                                 .reshaped();
                 auto v_tri_th = Vec2Triplet(sp_thermal_top3d_->iK_, sp_thermal_top3d_->jK_, sK_th);
                 sp_thermal_top3d_->K_.setFromTriplets(v_tri_th.begin(), v_tri_th.end());
@@ -149,12 +146,7 @@ namespace da::sha::top {
                 // solve U
 
                 Eigen::VectorXd sK_m =
-                        (sp_mech_top3d_->sKe_ *
-                                (
-                                xPhys_col.array() /
-                                (1.0 + sp_para_->R_E * (1.0 - xPhys_col.array())) *
-                                E0_m).matrix()
-                                .transpose())
+                        (sp_mech_top3d_->sKe_ * CalE_Vec(xPhys_col).transpose())
                                 .reshaped();
                 auto v_tri_m = Vec2Triplet(sp_mech_top3d_->iK_, sp_mech_top3d_->jK_, sK_m);
                 sp_mech_top3d_->K_.setFromTriplets(v_tri_m.begin(), v_tri_m.end());
@@ -188,9 +180,7 @@ namespace da::sha::top {
                     ce(i) = Ue.transpose() * sp_mech_top3d_->Ke_ * Ue;
                 }
                 double c =
-                        ce.transpose() * (xPhys_col.array() /
-                                          (1.0 + sp_para_->R_E * (1.0 - xPhys_col.array())) *
-                                          E0_m).matrix();
+                        ce.transpose() * CalE_Vec(xPhys_col);
                 double v = flg_chosen ? xPhys_col(chosen_ele_id).sum() : xPhys_col.sum();
 
                 // sensitivity
@@ -242,7 +232,7 @@ namespace da::sha::top {
                 Eigen::SparseMatrix<double> &dF_drho = dFth_drho;
                 // lambda_m_Mul_dKm_drho_Mul_U
                 Eigen::VectorXd lambda_m_Mul_dKm_drho_Mul_U =
-                        -((1 + sp_para_->R_E) / (1.0 + sp_para_->R_E * (1.0 - xPhys_col.array())).pow(2)) * ce.array();
+                        -CalDEDrho_Vec(xPhys_col).array() * ce.array();
                 // lambda_t_Mul_dKt_drho_Mul_T
                 Eigen::VectorXd ce_th(sp_thermal_top3d_->sp_mesh_->GetNumEles());
                 for (int i = 0; i < sp_thermal_top3d_->sp_mesh_->GetNumEles(); ++i) {
@@ -251,18 +241,14 @@ namespace da::sha::top {
                     Eigen::VectorXd lambda_t_e = lambda_t(dofs_in_ele_i);
                     ce_th(i) = lambda_t_e.transpose() * sp_thermal_top3d_->Ke_ * Te;
                 }
-                Eigen::VectorXd lambda_t_Mul_dKt_drho_Mul_T = ((1 + (lambda0 - lambda_min)) /
-                                                               (1.0 +
-                                                                (lambda0 - lambda_min) * (1.0 - xPhys_col.array())).pow(
-                                                                       2)) *
-                                                              ce_th.array();
+                Eigen::VectorXd lambda_t_Mul_dKt_drho_Mul_T = CalDlambdaDrho_Vec(xPhys_col).array() * ce_th.array();
                 // dc_drho
-//                Eigen::VectorXd dc_drho = lambda_t_Mul_dKt_drho_Mul_T +
-//                                          lambda_m_Mul_dKm_drho_Mul_U +
-//                                          2 * Eigen::VectorXd(dF_drho * sp_mech_top3d_->U_);
-                Eigen::VectorXd dc_drho =
+                Eigen::VectorXd dc_drho = lambda_t_Mul_dKt_drho_Mul_T +
                                           lambda_m_Mul_dKm_drho_Mul_U +
                                           2 * Eigen::VectorXd(dF_drho * sp_mech_top3d_->U_);
+//                Eigen::VectorXd dc_drho =
+//                        lambda_m_Mul_dKm_drho_Mul_U +
+//                        2 * Eigen::VectorXd(dF_drho * sp_mech_top3d_->U_);
                 // dT_drho
                 Eigen::MatrixXd dT_drho = Eigen::MatrixXd::Zero(sp_thermal_top3d_->sp_mesh_->GetNumEles(),
                                                                 sp_thermal_top3d_->set_dofs_to_load.size());