From c599072047a54386370f428b48a58f71eb45bb16 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@uliege.be>
Date: Sat, 9 Jan 2021 17:28:21 +0100
Subject: [PATCH] sync with template + fix static postop
---
Magnetodynamics/Lib_Magnetodynamics2D_av_Cir.pro | 13 +++++++++++++
Magnetodynamics/electromagnet.pro | 15 +++++++++++----
Magnetodynamics/transfo.pro | 7 +++----
3 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/Magnetodynamics/Lib_Magnetodynamics2D_av_Cir.pro b/Magnetodynamics/Lib_Magnetodynamics2D_av_Cir.pro
index b1718d1..716a045 100644
--- a/Magnetodynamics/Lib_Magnetodynamics2D_av_Cir.pro
+++ b/Magnetodynamics/Lib_Magnetodynamics2D_av_Cir.pro
@@ -408,6 +408,7 @@ Resolution {
}
}
Operation {
+ CreateDirectory[resPath];
If(Flag_FrequencyDomain)
Generate[A]; Solve[A]; SaveSolution[A];
Else
@@ -438,6 +439,7 @@ Resolution {
{ Name A; NameOfFormulation Magnetostatics2D_a; }
}
Operation {
+ CreateDirectory[resPath];
InitSolution[A];
Generate[A]; Solve[A];
If(NbrRegions[Vol_NL_Mag])
@@ -473,6 +475,10 @@ PostProcessing {
Term { [ CompZ[{a}] ]; In Vol_Mag; Jacobian Vol; }
}
}
+ { Name xaz; Value {
+ Term { [ X[] * CompZ[{a}] ]; In Vol_Mag; Jacobian Vol; }
+ }
+ }
{ Name b; Value {
Term { [ {d a} ]; In Vol_Mag; Jacobian Vol; }
}
@@ -542,6 +548,10 @@ PostProcessing {
Term { [ CompZ[{a}] ]; In Vol_Mag; Jacobian Vol; }
}
}
+ { Name xaz; Value {
+ Term { [ X[] * CompZ[{a}] ]; In Vol_Mag; Jacobian Vol; }
+ }
+ }
{ Name b; Value {
Term { [ {d a} ]; In Vol_Mag; Jacobian Vol; }
}
@@ -556,6 +566,9 @@ PostProcessing {
Term { [ Vector[0,0,0] ]; In Vol_Mag; Jacobian Vol; }
}
}
+ { Name flux; Value {
+ Integral { [ CoefGeos[] * Ns[] / Sc[] * CompZ[{a}] ];
+ In Vol_S_Mag; Jacobian Vol; Integration Gauss_v; } } }
}
}
}
diff --git a/Magnetodynamics/electromagnet.pro b/Magnetodynamics/electromagnet.pro
index 22fdf16..b889238 100644
--- a/Magnetodynamics/electromagnet.pro
+++ b/Magnetodynamics/electromagnet.pro
@@ -8,13 +8,13 @@
current source
To compute the static solution in a terminal:
- getdp electromagnet -solve Magnetostatics2D_a -pos Map_a
+ getdp electromagnet -solve Magnetostatics2D_a -pos sta
To compute the frequency-domain solution in a terminal:
- getdp electromagnet -solve Magnetodynamics2D_av -pos Map_a
+ getdp electromagnet -solve Magnetodynamics2D_av -pos dyn
To compute the time-dependent dynamic solution in a terminal:
- getdp electromagnet -setnumber TimeDomain 1 -solve Magnetodynamics2D_av -pos Map_a
+ getdp electromagnet -setnumber TimeDomain 1 -solve Magnetodynamics2D_av -pos dyn
To compute the solution interactively from the Gmsh GUI:
File > Open > electromagnet.pro
@@ -113,7 +113,14 @@ Constraint {
Include "Lib_Magnetodynamics2D_av_Cir.pro";
PostOperation {
- { Name Map_a; NameOfPostProcessing Magnetodynamics2D_av;
+ { Name dyn; NameOfPostProcessing Magnetodynamics2D_av;
+ Operation {
+ Print[ a, OnElementsOf Vol_Mag, File "a.pos" ];
+ Print[ b, OnElementsOf Vol_Mag, File "b.pos" ];
+ Print[ j, OnElementsOf Vol_Mag, File "j.pos" ];
+ }
+ }
+ { Name sta; NameOfPostProcessing Magnetostatics2D_a;
Operation {
Print[ a, OnElementsOf Vol_Mag, File "a.pos" ];
Print[ b, OnElementsOf Vol_Mag, File "b.pos" ];
diff --git a/Magnetodynamics/transfo.pro b/Magnetodynamics/transfo.pro
index 86192e6..3ec7ac7 100644
--- a/Magnetodynamics/transfo.pro
+++ b/Magnetodynamics/transfo.pro
@@ -6,7 +6,7 @@
- Circuit coupling used as a black-box (see Tutorial 8 for details)
To compute the solution in a terminal:
- getdp transfo -solve Magnetodynamics2D_av -pos Map_a
+ getdp transfo -solve Magnetodynamics2D_av -pos dyn
To compute the solution interactively from the Gmsh GUI:
File > Open > transfo.pro
@@ -21,8 +21,7 @@ DefineConstant[
// way as far as circuit-coupling is concerned
ConductorType = {2, Choices{1 = "Massive", 2 = "Coil"}, Highlight "Blue",
Name "Parameters/01Conductor type"}
- Freq = {1, Min 0, Max 1e3, Step 1,
- Name "Parameters/Frequency"}
+ Freq = {1, Min 0, Max 1e3, Step 1, Name "Parameters/Frequency"}
mur_Core = {1000, Min 1, Max 10000, Step 1,
Name "Parameters/Core relative permeability"}
];
@@ -190,7 +189,7 @@ Constraint {
Include "Lib_Magnetodynamics2D_av_Cir.pro";
PostOperation {
- { Name Map_a; NameOfPostProcessing Magnetodynamics2D_av;
+ { Name dyn; NameOfPostProcessing Magnetodynamics2D_av;
Operation {
Print[ j, OnElementsOf Region[{Vol_C_Mag, Vol_S_Mag}], Format Gmsh, File "j.pos" ];
Print[ b, OnElementsOf Vol_Mag, Format Gmsh, File "b.pos" ];
--
GitLab