From 406b1eda80e7a360f8bf9776fcbaa83d217da885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Henrotte?= <francois.henrotte@uclouvain.be>
Date: Fri, 20 Mar 2020 21:50:15 +0100
Subject: [PATCH] updates and correction
---
Conductors3D/w2d.geo | 2 +-
Conductors3D/w2d.pro | 6 +++---
Conductors3D/{w2s_common.pro => w2d_common.pro} | 0
Conductors3D/w3d.pro | 8 +++++---
4 files changed, 9 insertions(+), 7 deletions(-)
rename Conductors3D/{w2s_common.pro => w2d_common.pro} (100%)
diff --git a/Conductors3D/w2d.geo b/Conductors3D/w2d.geo
index daa57e2..ba51575 100644
--- a/Conductors3D/w2d.geo
+++ b/Conductors3D/w2d.geo
@@ -1,4 +1,4 @@
-Include "wires_common.pro";
+Include "w2d_common.pro";
// global Gmsh options
Mesh.Optimize = 1; // optimize quality of tetrahedra
diff --git a/Conductors3D/w2d.pro b/Conductors3D/w2d.pro
index 3205664..f43b73e 100644
--- a/Conductors3D/w2d.pro
+++ b/Conductors3D/w2d.pro
@@ -1,4 +1,4 @@
-Include "wires_common.pro";
+Include "w2d_common.pro";
Struct S::SOLVER [ Enum, mumps, gmres, fgmres,bcgs ];
DefineConstant[
@@ -132,8 +132,8 @@ Function{
((R_2[]<rs) ? WI_2*Analytic_A[R_2[]] : 0 ));
EndIf
If ( NumWires == 3 )
- Exact_a[] = WI_1*Analytic_A[R_1[]] + WI_2*Analytic_A[R_2[]]
- + WI_3*Analytic_A[R_3[]] + (WI1_+WI_2+WI_3)*mu0/(2*Pi) * NumWires * Log[rout/rs] ;
+ Exact_A[] = WI_1*Analytic_A[R_1[]] + WI_2*Analytic_A[R_2[]]
+ + WI_3*Analytic_A[R_3[]] + (WI_1+WI_2+WI_3)*mu0/(2*Pi) * NumWires * Log[rout/rs] ;
Correction_A[] = ((R_1[]<rs) ? WI_1*Analytic_A[R_1[]] :
((R_2[]<rs) ? WI_2*Analytic_A[R_2[]] :
((R_3[]<rs) ? WI_3*Analytic_A[R_3[]] : 0 )));
diff --git a/Conductors3D/w2s_common.pro b/Conductors3D/w2d_common.pro
similarity index 100%
rename from Conductors3D/w2s_common.pro
rename to Conductors3D/w2d_common.pro
diff --git a/Conductors3D/w3d.pro b/Conductors3D/w3d.pro
index b3700d4..69d4578 100644
--- a/Conductors3D/w3d.pro
+++ b/Conductors3D/w3d.pro
@@ -578,11 +578,13 @@ PostOperation map UsingPost MagnetoDynamics {
Print[ bs, OnElementsOf Vol_nu, File "bs.pos"];
PrintGroup[ EdgesOf[ Vol_nu, ConnectedTo LWIRES ],
In Vol_nu, File "group.pos"];
+ PrintGroup[ _CO_Entity_71, In Vol_nu, File "Tree.pos"];
EndIf
- PrintGroup[ EdgesOfTreeIn[ { Vol_Tree }, StartingOn { Sur_Tree, Lin_Tree } ],
- In Vol_nu, File "Tree.pos"];
+
+ // PrintGroup[ EdgesOfTreeIn[ { Vol_Tree }, StartingOn { Sur_Tree, Lin_Tree } ],
+ // In Vol_nu, File "Tree.pos"];
- //PrintGroup[ _CO_Entity_44, In Vol_nu, File "Tree.pos"];
+
}
--
GitLab