Merge pull request #215 from loganoz/omarinoDev

Omarino dev
loganoz · Apr 5, 2024 · b9eccb4 · b9eccb4
2 parents 64ef170 + e5cfcd6
commit b9eccb4
Show file tree

Hide file tree

Showing 15 changed files with 145 additions and 59 deletions.
diff --git a/Solver/src/CahnHilliardSolver/main.f90 b/Solver/src/CahnHilliardSolver/main.f90
@@ -335,7 +335,7 @@ subroutine DisplaySimulationStatistics(iter,mesh)
 
          call Subsection_Header("Preprocessing")
 
-         write(STD_OUT,'(30X,A,I0,A,F5.2,A,I0,A)')      "->   ", mesh % no_of_elements, &
+         write(STD_OUT,'(30X,A,I0,A,F5.2,A,I0,A)')      "->   ", mesh % no_of_allElements, &
                                                       " elements with polynomial order ",Naverage," (NDOF = ",NDOF,")."
          write(STD_OUT,'(30X,A,A30,ES10.3,A,ES10.3,A)') "->", "Preprocessing time: ",t_elaps," seconds (total CPU time: ",t_cpu,")."
 
@@ -380,4 +380,4 @@ subroutine CheckIfTheVersionIsRequested
             end if
          end do
 
-      end subroutine CheckIfTheVersionIsRequested
+      end subroutine CheckIfTheVersionIsRequested
diff --git a/Solver/src/IncompressibleNSSolver/main.f90 b/Solver/src/IncompressibleNSSolver/main.f90
@@ -335,7 +335,7 @@ subroutine DisplaySimulationStatistics(iter,mesh)
 
          call Subsection_Header("Preprocessing")
 
-         write(STD_OUT,'(30X,A,I0,A,F5.2,A,I0,A)')      "->   ", mesh % no_of_elements, &
+         write(STD_OUT,'(30X,A,I0,A,F5.2,A,I0,A)')      "->   ", mesh % no_of_allElements, &
                                                       " elements with polynomial order ",Naverage," (NDOF = ",NDOF,")."
          write(STD_OUT,'(30X,A,A30,ES10.3,A,ES10.3,A)') "->", "Preprocessing time: ",t_elaps," seconds (total CPU time: ",t_cpu,")."
 
@@ -380,4 +380,4 @@ subroutine CheckIfTheVersionIsRequested
             end if
          end do
 
-      end subroutine CheckIfTheVersionIsRequested
+      end subroutine CheckIfTheVersionIsRequested
diff --git a/Solver/src/MultiphaseSolver/main.f90 b/Solver/src/MultiphaseSolver/main.f90
@@ -335,7 +335,7 @@ subroutine DisplaySimulationStatistics(iter,mesh)
 
          call Subsection_Header("Preprocessing")
 
-         write(STD_OUT,'(30X,A,I0,A,F5.2,A,I0,A)')      "->   ", mesh % no_of_elements, &
+         write(STD_OUT,'(30X,A,I0,A,F5.2,A,I0,A)')      "->   ", mesh % no_of_allElements, &
                                                       " elements with polynomial order ",Naverage," (NDOF = ",NDOF,")."
          write(STD_OUT,'(30X,A,A30,ES10.3,A,ES10.3,A)') "->", "Preprocessing time: ",t_elaps," seconds (total CPU time: ",t_cpu,")."
 
@@ -380,4 +380,4 @@ subroutine CheckIfTheVersionIsRequested
             end if
          end do
 
-      end subroutine CheckIfTheVersionIsRequested
+      end subroutine CheckIfTheVersionIsRequested
diff --git a/Solver/src/NavierStokesSolver/main.f90 b/Solver/src/NavierStokesSolver/main.f90
@@ -351,7 +351,7 @@ subroutine DisplaySimulationStatistics(iter,mesh)
 
          call Subsection_Header("Preprocessing")
 
-         write(STD_OUT,'(30X,A,I0,A,F5.2,A,I0,A)')      "->   ", mesh % no_of_elements, &
+         write(STD_OUT,'(30X,A,I0,A,F5.2,A,I0,A)')      "->   ", mesh % no_of_allElements, &
                                                       " elements with polynomial order ",Naverage," (NDOF = ",NDOF,")."
          write(STD_OUT,'(30X,A,A30,ES10.3,A,ES10.3,A)') "->", "Preprocessing time: ",t_elaps," seconds (total CPU time: ",t_cpu,")."
 
@@ -396,4 +396,4 @@ subroutine CheckIfTheVersionIsRequested
             end if
          end do
 
-      end subroutine CheckIfTheVersionIsRequested
+      end subroutine CheckIfTheVersionIsRequested
diff --git a/Solver/src/NavierStokesSolverRANS/main.f90 b/Solver/src/NavierStokesSolverRANS/main.f90
@@ -350,7 +350,7 @@ subroutine DisplaySimulationStatistics(iter,mesh)
 
          call Subsection_Header("Preprocessing")
 
-         write(STD_OUT,'(30X,A,I0,A,F5.2,A,I0,A)')      "->   ", mesh % no_of_elements, &
+         write(STD_OUT,'(30X,A,I0,A,F5.2,A,I0,A)')      "->   ", mesh % no_of_allElements, &
                                                       " elements with polynomial order ",Naverage," (NDOF = ",NDOF,")."
          write(STD_OUT,'(30X,A,A30,ES10.3,A,ES10.3,A)') "->", "Preprocessing time: ",t_elaps," seconds (total CPU time: ",t_cpu,")."
 
@@ -395,4 +395,4 @@ subroutine CheckIfTheVersionIsRequested
             end if
          end do
 
-      end subroutine CheckIfTheVersionIsRequested
+      end subroutine CheckIfTheVersionIsRequested
diff --git a/Solver/src/libs/mesh/HexMesh.f90 b/Solver/src/libs/mesh/HexMesh.f90
@@ -2861,9 +2861,9 @@ subroutine HexMesh_ExportOrders(self,fileName)
          OrderFileName = "./MESH/" // trim(removePath(getFileName(fileName))) // ".omesh"
          open( newunit = fd , FILE = TRIM(OrderFileName), ACTION = 'write')
 
-         write(fd,*) self % no_of_allElements
+         write(fd,*) self % no_of_elements
 
-         do k=1, self % no_of_allElements
+         do k=1, self % no_of_elements
             write(fd,*) self % elements(k) % Nxyz
          end do