From c38fcf8ed723cb9665251c26d2badc6772738e7c Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Fri, 17 Mar 2023 04:42:28 +0100
Subject: [PATCH] [FEM] Elmer: add new default coordinate system

- for new versions of Elmer the default coordinate system is "Cartesian". (if 2D or 3D is determined by the "Variable" setting for the equation)
---
 src/Mod/Fem/femsolver/elmer/solver.py                         | 4 ++--
 src/Mod/Fem/femsolver/elmer/writer.py                         | 2 +-
 src/Mod/Fem/femtest/data/elmer/box_static_0_mm.sif            | 2 +-
 .../Fem/femtest/data/elmer/ccxcantilever_faceload_0_mm.sif    | 2 +-
 .../Fem/femtest/data/elmer/ccxcantilever_faceload_1_si.sif    | 2 +-
 .../Fem/femtest/data/elmer/ccxcantilever_nodeload_0_mm.sif    | 2 +-
 .../data/elmer/ccxcantilever_prescribeddisplacement_0_mm.sif  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Mod/Fem/femsolver/elmer/solver.py b/src/Mod/Fem/femsolver/elmer/solver.py
index 7e1ac9f95d..58da856b30 100644
--- a/src/Mod/Fem/femsolver/elmer/solver.py
+++ b/src/Mod/Fem/femsolver/elmer/solver.py
@@ -49,7 +49,7 @@ from femtools import femutils
 if FreeCAD.GuiUp:
     import FemGui
 
-COORDINATE_SYSTEM = ["Cartesian 1D", "Cartesian 2D", "Cartesian 3D",
+COORDINATE_SYSTEM = ["Cartesian", "Cartesian 1D", "Cartesian 2D", "Cartesian 3D",
                      "Polar 2D", "Polar 3D",
                      "Cylindric", "Cylindric Symmetric",
                      "Axi Symmetric"]
@@ -87,7 +87,7 @@ class Proxy(solverbase.Proxy):
             ""
         )
         obj.CoordinateSystem = COORDINATE_SYSTEM
-        obj.CoordinateSystem = "Cartesian 3D"
+        obj.CoordinateSystem = "Cartesian"
 
         obj.addProperty(
             "App::PropertyIntegerConstraint",
diff --git a/src/Mod/Fem/femsolver/elmer/writer.py b/src/Mod/Fem/femsolver/elmer/writer.py
index 3ce20b0824..418a8c5a45 100644
--- a/src/Mod/Fem/femsolver/elmer/writer.py
+++ b/src/Mod/Fem/femsolver/elmer/writer.py
@@ -364,7 +364,7 @@ class Writer(object):
                 ""
             )
             solver.CoordinateSystem = solverClass.COORDINATE_SYSTEM
-            solver.CoordinateSystem = "Cartesian 3D"
+            solver.CoordinateSystem = "Cartesian"
         if not hasattr(self.solver, "BDFOrder"):
             solver.addProperty(
                 "App::PropertyIntegerConstraint",
diff --git a/src/Mod/Fem/femtest/data/elmer/box_static_0_mm.sif b/src/Mod/Fem/femtest/data/elmer/box_static_0_mm.sif
index 1cd043f720..a24c2173fd 100644
--- a/src/Mod/Fem/femtest/data/elmer/box_static_0_mm.sif
+++ b/src/Mod/Fem/femtest/data/elmer/box_static_0_mm.sif
@@ -26,7 +26,7 @@ End
 Simulation 
   Coordinate Mapping(3) = Integer 1 2 3
   Coordinate Scaling = Real 0.001
-  Coordinate System = String "Cartesian 3D"
+  Coordinate System = String "Cartesian"
   Output Intervals = Integer 1
   Simulation Type = String "Steady State"
   Steady State Max Iterations = Integer 1
diff --git a/src/Mod/Fem/femtest/data/elmer/ccxcantilever_faceload_0_mm.sif b/src/Mod/Fem/femtest/data/elmer/ccxcantilever_faceload_0_mm.sif
index 155d966040..de5ec3a45a 100644
--- a/src/Mod/Fem/femtest/data/elmer/ccxcantilever_faceload_0_mm.sif
+++ b/src/Mod/Fem/femtest/data/elmer/ccxcantilever_faceload_0_mm.sif
@@ -26,7 +26,7 @@ End
 Simulation 
   Coordinate Mapping(3) = Integer 1 2 3
   Coordinate Scaling = Real 0.001
-  Coordinate System = String "Cartesian 3D"
+  Coordinate System = String "Cartesian"
   Output Intervals = Integer 1
   Simulation Type = String "Steady State"
   Steady State Max Iterations = Integer 1
diff --git a/src/Mod/Fem/femtest/data/elmer/ccxcantilever_faceload_1_si.sif b/src/Mod/Fem/femtest/data/elmer/ccxcantilever_faceload_1_si.sif
index 155d966040..de5ec3a45a 100644
--- a/src/Mod/Fem/femtest/data/elmer/ccxcantilever_faceload_1_si.sif
+++ b/src/Mod/Fem/femtest/data/elmer/ccxcantilever_faceload_1_si.sif
@@ -26,7 +26,7 @@ End
 Simulation 
   Coordinate Mapping(3) = Integer 1 2 3
   Coordinate Scaling = Real 0.001
-  Coordinate System = String "Cartesian 3D"
+  Coordinate System = String "Cartesian"
   Output Intervals = Integer 1
   Simulation Type = String "Steady State"
   Steady State Max Iterations = Integer 1
diff --git a/src/Mod/Fem/femtest/data/elmer/ccxcantilever_nodeload_0_mm.sif b/src/Mod/Fem/femtest/data/elmer/ccxcantilever_nodeload_0_mm.sif
index 027662232f..bbf1e46b50 100644
--- a/src/Mod/Fem/femtest/data/elmer/ccxcantilever_nodeload_0_mm.sif
+++ b/src/Mod/Fem/femtest/data/elmer/ccxcantilever_nodeload_0_mm.sif
@@ -26,7 +26,7 @@ End
 Simulation 
   Coordinate Mapping(3) = Integer 1 2 3
   Coordinate Scaling = Real 0.001
-  Coordinate System = String "Cartesian 3D"
+  Coordinate System = String "Cartesian"
   Output Intervals = Integer 1
   Simulation Type = String "Steady State"
   Steady State Max Iterations = Integer 1
diff --git a/src/Mod/Fem/femtest/data/elmer/ccxcantilever_prescribeddisplacement_0_mm.sif b/src/Mod/Fem/femtest/data/elmer/ccxcantilever_prescribeddisplacement_0_mm.sif
index 735754f376..382d54d55b 100644
--- a/src/Mod/Fem/femtest/data/elmer/ccxcantilever_prescribeddisplacement_0_mm.sif
+++ b/src/Mod/Fem/femtest/data/elmer/ccxcantilever_prescribeddisplacement_0_mm.sif
@@ -26,7 +26,7 @@ End
 Simulation 
   Coordinate Mapping(3) = Integer 1 2 3
   Coordinate Scaling = Real 0.001
-  Coordinate System = String "Cartesian 3D"
+  Coordinate System = String "Cartesian"
   Output Intervals = Integer 1
   Simulation Type = String "Steady State"
   Steady State Max Iterations = Integer 1