Commit 1126ddcf authored by Christophe Geuzaine's avatar Christophe Geuzaine

cleanup

parent dcfdc12e
Pipeline #1452 passed with stage
in 11 minutes and 58 seconds
......@@ -50,10 +50,10 @@ Function {
mu [ Core ] = murCore * mu0;
EndIf
If(Flag_NL)
nu [ Core ] = SteelInd_nu[$1] ;
dhdb_NL [ Core ] = SteelInd_dhdb_NL[$1];
mu [ Core ] = SteelInd_mu[$1] ;
dbdh_NL [ Core ] = SteelInd_dbdh_NL[$1];
nu [ Core ] = SteelGeneric_nu[$1] ;
dhdb_NL [ Core ] = SteelGeneric_dhdb_NL[$1];
mu [ Core ] = SteelGeneric_mu[$1] ;
dbdh_NL [ Core ] = SteelGeneric_dbdh_NL[$1];
EndIf
mu [ Region[{Air, AirInf, AirGap, Magnet}] ] = mu0 ;
......
......@@ -2,10 +2,10 @@
// interactively:
//
// 1) Create a geometry with Gmsh
// 2) Merge this file with File->Merge
// 2) Merge this file with Gmsh using File->Merge
// 3) You will be prompted to setup your materials and boundary conditions for
// each physical group, interactively
// 4) Everytime you click on "Run", an "export.pro" file will be created,
// 4) Everytime you click on "Run", an "export.pro" file will also be created,
// which will contain all your choices for later non-interactive use
DefineConstant[
......
......@@ -2,10 +2,10 @@
// interactively:
//
// 1) Create a geometry with Gmsh
// 2) Merge this file with File->Merge
// 2) Merge this file with Gmsh using File->Merge
// 3) You will be prompted to setup your materials and boundary conditions for
// each physical group, interactively
// 4) Everytime you click on "Run", an "export.pro" file will be created,
// 4) Everytime you click on "Run", an "export.pro" file will also be created,
// which will contain all your choices for later non-interactive use
DefineConstant[
......@@ -223,13 +223,13 @@ Function{
If(bh_preset~{i} == 0) // data points
n = Sprintf["UserMaterialPts_%g", i];
str = StrCat[n, "_b_list() = ", b_list~{i}, "; ", n, "_h_list() = ",
h_list~{i}, "; ", "_MaterialName_ = '", n,
h_list~{i}, "; ", "_materialName = '", n,
"'; Call DefineMaterialFunctions; "];
ElseIf(bh_preset~{i} == 1) // function
n = Sprintf["UserMaterialFct_%g", i];
str = StrCat[n, "_nu[] = ", nu_fct~{i}, "; ", n, "_dnudb2[] = ",
dnudb2_fct~{i}, "; ", n, "_mu[] = ", nu_fct~{i}, "; ", n,
"_dmudh2[] = ", dnudb2_fct~{i}, "; ", "_MaterialName_ = '", n,
"_dmudh2[] = ", dnudb2_fct~{i}, "; ", "_materialName = '", n,
"'; Call DefineMaterialFunctions; "];
Else // preset
n = Str[ nonlinearMagneticMaterials(bh_preset~{i}) ];
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment