diff --git a/ECE_full_wave_E-H_Academic/formulations/only_FunctionSpace_and_Formulation_FullWave_E_ece_secondOrder.pro b/ECE_full_wave_E-H_Academic/formulations/only_FunctionSpace_and_Formulation_FullWave_E_ece_secondOrder.pro index 06901e53c529123bf26d7adcf8f921e50479f688..68ac29bb51e8aa4ef4704589fb26115933418e7c 100644 --- a/ECE_full_wave_E-H_Academic/formulations/only_FunctionSpace_and_Formulation_FullWave_E_ece_secondOrder.pro +++ b/ECE_full_wave_E-H_Academic/formulations/only_FunctionSpace_and_Formulation_FullWave_E_ece_secondOrder.pro @@ -4,9 +4,10 @@ FunctionSpace { BasisFunction { { Name se; NameOfCoef ee; Function BF_Edge; Support Dom_FW ; Entity EdgesOf[All, Not Sur_FW]; } - // additional basis functions for 2nd order interpolation (hierachical) + If(FE_Order == 2) - { Name se2; NameOfCoef ee2; Function BF_Edge_2E; + // additional basis functions for 2nd order interpolation (hierachical) + { Name se2; NameOfCoef ee2; Function BF_Edge_2E; Support Dom_FW; Entity EdgesOf[All, Not Sur_FW]; } // Reduced 2nd order { Name se3a ; NameOfCoef ee3a ; Function BF_Edge_3F_a ; @@ -19,16 +20,16 @@ FunctionSpace { EndIf { Name sn; NameOfCoef vn; Function BF_GradNode; - Support Dom_FW ; Entity NodesOf[Sur_FW, Not Sur_Terminals_FWece]; } + Support Dom_FW ; Entity NodesOf[Sur_FW, Not Sur_Terminals_FWece]; } If(FE_Order == 2) // GradNode BFs { Name sn2; NameOfCoef vn2; Function BF_GradNode_2E; Support Dom_FW ; Entity EdgesOf[Sur_FW, Not Sur_Terminals_FWece]; } EndIf - { Name sf; NameOfCoef vf; Function BF_GradGroupOfNodes; - Support Dom_FW ; Entity GroupsOfNodesOf[Sur_Terminals_FWece]; } - } + { Name sf; NameOfCoef vf; Function BF_GradGroupOfNodes; + Support Dom_FW ; Entity GroupsOfNodesOf[Sur_Terminals_FWece]; } + } GlobalQuantity { { Name TerminalPotential; Type AliasOf ; NameOfCoef vf; } @@ -39,13 +40,12 @@ FunctionSpace { { Name dv ; NameOfBasisFunction {sn}; } // Subspace, it maybe use in equations or post-pro { Name dvf ; NameOfBasisFunction {sf}; } } -S + Constraint { { NameOfCoef TerminalPotential; EntityType GroupsOfNodesOf; NameOfConstraint SetTerminalPotential; } { NameOfCoef TerminalCurrent; EntityType GroupsOfNodesOf; NameOfConstraint SetTerminalCurrent; } - } } } @@ -61,7 +61,6 @@ Formulation { { Name I; Type Global; NameOfSpace Hcurl_E[TerminalCurrent]; } } Equation { - // \int_D curl(\vec{E}) \cdot curl(\vec{e}) dv Galerkin { [ nu[] * Dof{d e} , {d e} ]; In Vol_FW; Jacobian Vol; Integration Int; } @@ -73,7 +72,7 @@ Formulation { // GlobalTerm {DtDof [ -Dof{I} , {V} ]; In SurBCec; } // j*\omega*sum (vk Ik); for k - all terminals so that the currents through the terminals will be computed as well - GlobalTerm {DtDof [ -Dof{I} , {V} ]; In Sur_Terminals_FWece; } + GlobalTerm { DtDof [ -Dof{I} , {V} ]; In Sur_Terminals_FWece; } } } }