From e4e208f33ad0f51950128d470f6332febd5fd280 Mon Sep 17 00:00:00 2001
From: rubenzorrilla <rubenzorrillamartinez@hotmail.com>
Date: Fri, 26 Apr 2024 16:23:25 +0200
Subject: [PATCH 1/3] Adding P2P1

---
 kratos.gid/apps/Fluid/xml/Elements.xml   | 54 ++++++++++++++++++++++++
 kratos.gid/apps/Fluid/xml/Strategies.xml |  2 +-
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/kratos.gid/apps/Fluid/xml/Elements.xml b/kratos.gid/apps/Fluid/xml/Elements.xml
index efa6d9a5c..ab2a33dcf 100644
--- a/kratos.gid/apps/Fluid/xml/Elements.xml
+++ b/kratos.gid/apps/Fluid/xml/Elements.xml
@@ -270,4 +270,58 @@
         </outputs>
     </ElementItem>
 
+    <ElementItem n="P2P12D" pn="P2-P1" ImplementedInFile="incompressible_navier_stokes_p2_p1_continuous.cpp" ImplementedInApplication="FluidDynamicsApplication" FormulationElementType="p2_p1"
+        MinimumKratosVersion="9000"  WorkingSpaceDimension="2D" LocalSpaceDimension="2" RequiresLocalAxes="False"
+        LargeDeformation="False" ElementType="Fluid" help="This element implements a P2-P1 incompressible Navier-Stokes element">
+        <!--here we could add a list of all of the possible geometries-->
+        <TopologyFeatures>
+            <item GeometryType="Triangle" nodes="6" KratosName="Element2D6N"/>
+        </TopologyFeatures>
+        <!-- here we add the block of features which we require from the constitutive law-->
+
+        <ConstitutiveLaw_FilterFeatures>
+            <filter field="App" value="Fluid"/>
+            <filter field="ElementCompressibility" value="Incompressible"/>
+        </ConstitutiveLaw_FilterFeatures>
+
+        <!--define list of NodalConditions-->
+        <NodalConditions>
+            <NodalCondition n="VELOCITY"/>
+            <NodalCondition n="PRESSURE"/>
+        </NodalConditions>
+
+        <inputs>
+        </inputs>
+
+        <outputs>
+        </outputs>
+    </ElementItem>
+
+    <ElementItem n="P2P13D" pn="P2-P1" ImplementedInFile="incompressible_navier_stokes_p2_p1_continuous.cpp" ImplementedInApplication="FluidDynamicsApplication" FormulationElementType="p2p1"
+        MinimumKratosVersion="9000"  WorkingSpaceDimension="3D" LocalSpaceDimension="3" RequiresLocalAxes="False"
+        LargeDeformation="False" ElementType="Fluid" help="This element implements a P2-P1 incompressible Navier-Stokes element">
+        <!--here we could add a list of all of the possible geometries-->
+        <TopologyFeatures>
+            <item GeometryType="Tetrahedra" nodes="10" KratosName="Element3D10N"/>
+        </TopologyFeatures>
+        <!-- here we add the block of features which we require from the constitutive law-->
+
+        <ConstitutiveLaw_FilterFeatures>
+            <filter field="App" value="Fluid"/>
+            <filter field="ElementCompressibility" value="Incompressible"/>
+        </ConstitutiveLaw_FilterFeatures>
+
+        <!--define list of NodalConditions-->
+        <NodalConditions>
+            <NodalCondition n="VELOCITY"/>
+            <NodalCondition n="PRESSURE"/>
+        </NodalConditions>
+
+        <inputs>
+        </inputs>
+
+        <outputs>
+        </outputs>
+    </ElementItem>
+
 </ElementList>
diff --git a/kratos.gid/apps/Fluid/xml/Strategies.xml b/kratos.gid/apps/Fluid/xml/Strategies.xml
index 1803f4ee5..2d20f0871 100644
--- a/kratos.gid/apps/Fluid/xml/Strategies.xml
+++ b/kratos.gid/apps/Fluid/xml/Strategies.xml
@@ -50,7 +50,7 @@
 			<scheme n="bdf2" pn="BDF2" help="2nd order Backward Differenctiation Formula (BDF2) scheme for CFD problems." >
                 <parameter_list></parameter_list>
                 <element_filters>
-                    <filter field="n" value="QSVMS2D,QSVMS3D,DVMS2D,DVMS3D,FIC2D,FIC3D,WeaklyCompressible2D,WeaklyCompressible3D"/>
+                    <filter field="n" value="QSVMS2D,QSVMS3D,DVMS2D,DVMS3D,FIC2D,FIC3D,WeaklyCompressible2D,WeaklyCompressible3D,P2P12D,P2P13D"/>
                 </element_filters>
             </scheme>
 		</schemes>

From c5cde3b595bfc78a00ae355e0ca88c8aaf0b7d23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20G=C3=A1rate?= <fjgarate@cimne.upc.edu>
Date: Fri, 26 Apr 2024 17:06:55 +0200
Subject: [PATCH 2/3] allow quad in fluid

---
 kratos.gid/apps/Fluid/write/write.tcl | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/kratos.gid/apps/Fluid/write/write.tcl b/kratos.gid/apps/Fluid/write/write.tcl
index 57d1265a7..c11c59470 100644
--- a/kratos.gid/apps/Fluid/write/write.tcl
+++ b/kratos.gid/apps/Fluid/write/write.tcl
@@ -206,17 +206,28 @@ proc ::Fluid::write::writeBoundaryConditions { } {
     spdAux::MergeGroups $skin_group_name $groups
     
     # Write the conditions
+    lassign [write::_getConditionDefaultName] kname nnodes
+    set last_condition_iterator [write::writeGroupConditionByUniqueId $skin_group_name $kname $nnodes 0 $::Fluid::write::FluidConditionMap]
+    
+    # Clean
+    GiD_Groups delete $skin_group_name
+}
+
+proc ::Fluid::write::_getConditionDefaultName { } {
+    set is_quadratic [write::isquadratic]
     if {$::Model::SpatialDimension eq "3D"} {
-        set kname SurfaceCondition3D3N
+
         set nnodes 3
+        if {$is_quadratic} {set nnodes 6}
+        
+        set kname SurfaceCondition3D${nnodes}N
     } {
-        set kname LineCondition2D2N
         set nnodes 2
+        if {$is_quadratic} {set nnodes 3}
+        set kname LineCondition2D${nnodes}N
     }
-    set last_condition_iterator [write::writeGroupConditionByUniqueId $skin_group_name $kname $nnodes 0 $::Fluid::write::FluidConditionMap]
-    
-    # Clean
-    GiD_Groups delete $skin_group_name
+
+    return [list $kname $nnodes]
 }
 
 proc ::Fluid::write::writeDrags { } {

From 4fa799b623cec4d0a0e2970d8afd1c49ade270c1 Mon Sep 17 00:00:00 2001
From: rubenzorrilla <rubenzorrillamartinez@hotmail.com>
Date: Tue, 30 Apr 2024 10:54:02 +0200
Subject: [PATCH 3/3] Minor

---
 kratos.gid/apps/Fluid/xml/Elements.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kratos.gid/apps/Fluid/xml/Elements.xml b/kratos.gid/apps/Fluid/xml/Elements.xml
index ab2a33dcf..4e8d0d3dc 100644
--- a/kratos.gid/apps/Fluid/xml/Elements.xml
+++ b/kratos.gid/apps/Fluid/xml/Elements.xml
@@ -270,7 +270,7 @@
         </outputs>
     </ElementItem>
 
-    <ElementItem n="P2P12D" pn="P2-P1" ImplementedInFile="incompressible_navier_stokes_p2_p1_continuous.cpp" ImplementedInApplication="FluidDynamicsApplication" FormulationElementType="p2_p1"
+    <ElementItem n="P2P12D" pn="P2-P1" ImplementedInFile="incompressible_navier_stokes_p2_p1_continuous.cpp" ImplementedInApplication="FluidDynamicsApplication" FormulationElementType="p2p1"
         MinimumKratosVersion="9000"  WorkingSpaceDimension="2D" LocalSpaceDimension="2" RequiresLocalAxes="False"
         LargeDeformation="False" ElementType="Fluid" help="This element implements a P2-P1 incompressible Navier-Stokes element">
         <!--here we could add a list of all of the possible geometries-->