Merge pull request #1 from NRavoisin96/MacOS

macOS support, floating points comparison initial revision

Geometry/Surfaces/QuadSurfaces/aPlane_class.f90

@@ -2,7 +2,7 @@ module aPlane_class
 
   use numPrecision
   use universalVariables, only : X_AXIS, Y_AXIS, Z_AXIS, INF
-  use genericProcedures,  only : fatalError
+  use genericProcedures,  only : fatalError, areEqual
   use dictionary_class,   only : dictionary
   use quadSurface_inter,  only : quadSurface
   use surface_inter,      only : kill_super => kill
@@ -196,14 +196,16 @@ pure function going(self, r, u) result(halfspace)
     real(defReal)                           :: ua
 
     ua = u(self % axis)
-    halfspace = ua > ZERO
 
-    ! Special case of parallel direction
-    ! Partilce stays in its current halfspace
-    if (ua == ZERO) then
+    ! Special case of parallel direction. Particle stays in its current halfspace.
+    if (areEqual(ua, ZERO)) then 
       halfspace = (r(self % axis) - self % a0) >= ZERO
+      return
+
     end if
 
+    halfspace = ua > ZERO
+
   end function going
 
   !!

Geometry/Surfaces/QuadSurfaces/cone_class.f90

@@ -2,7 +2,7 @@ module cone_class
 
   use numPrecision
   use universalVariables, only : SURF_TOL, INF, X_AXIS, Y_AXIS, Z_AXIS
-  use genericProcedures,  only : fatalError, numToChar, dotProduct
+  use genericProcedures,  only : fatalError, numToChar, areEqual
   use dictionary_class,   only : dictionary
   use quadSurface_inter,  only : quadSurface
   use surface_inter,      only : kill_super => kill
@@ -418,15 +418,16 @@ pure function going(self, r, u) result(halfspace)
     norm = norm/norm2(norm)
     proj = dot_product(norm,u)
 
-    ! Determine halfspace
-    halfspace = proj > ZERO
-
-    ! Parallel direction
-    ! Need to use position to determine halfspace
-    if (proj == ZERO) then
+    ! Parallel direction. Need to use position to determine halfspace.
+    if (areEqual(proj, ZERO)) then
       halfspace = self % evaluate(r) >= ZERO
+      return
+
     end if
 
+    ! Determine halfspace
+    halfspace = proj > ZERO
+
   end function going
 
   !!

Geometry/Surfaces/QuadSurfaces/cylinder_class.f90

@@ -2,7 +2,7 @@ module cylinder_class
 
   use numPrecision
   use universalVariables, only : SURF_TOL, INF, X_AXIS, Y_AXIS, Z_AXIS
-  use genericProcedures,  only : fatalError, numToChar, dotProduct
+  use genericProcedures,  only : fatalError, numToChar, areEqual
   use dictionary_class,   only : dictionary
   use quadSurface_inter,  only : quadSurface
   use surface_inter,      only : kill_super => kill
@@ -242,7 +242,7 @@ pure function distance(self, r, u) result(d)
     delta = k*k - a*c  ! Technically delta/4
 
     ! Calculate the distance
-    if (delta < ZERO .or. a == ZERO) then ! No intersection
+    if (delta < ZERO .or. areEqual(a, ZERO)) then ! No intersection
       d = INF
 
     else if (abs(c) < self % surfTol()) then ! Point at a surface

Geometry/Surfaces/QuadSurfaces/plane_class.f90

@@ -2,7 +2,7 @@ module plane_class
 
   use numPrecision
   use universalVariables, only : X_AXIS, Y_AXIS, Z_AXIS, INF
-  use genericProcedures,  only : fatalError, dotProduct, numToChar
+  use genericProcedures,  only : fatalError, numToChar, areEqual
   use dictionary_class,   only : dictionary
   use quadSurface_inter,  only : quadSurface
   use surface_inter,      only : kill_super => kill
@@ -128,7 +128,7 @@ pure function evaluate(self, r) result(c)
     real(defReal), dimension(3), intent(in) :: r
     real(defReal)                           :: c
 
-    c = dotProduct(r, self % norm) - self % offset
+    c = dot_product(r, self % norm) - self % offset
 
   end function evaluate
 
@@ -151,10 +151,10 @@ pure function distance(self, r, u) result(d)
     real(defReal)                           :: d
     real(defReal)                           :: k, c
 
-    k = dotProduct(u, self % norm)
+    k = dot_product(u, self % norm)
     c = self % evaluate(r)
 
-    if ( k == ZERO .or. abs(c) < self % surfTol()) then ! Parallel or at the surface
+    if (areEqual(k, ZERO) .or. abs(c) < self % surfTol()) then ! Parallel or at the surface
       d = INF
 
     else
@@ -180,15 +180,17 @@ pure function going(self, r, u) result(halfspace)
     logical(defBool)                        :: halfspace
     real(defReal)                           :: proj
 
-    proj = dotProduct(u, self % norm)
-    halfspace = proj > ZERO
-
-    ! Special case of parallel direction
-    ! Partilce stays in its current halfspace
-    if (proj == ZERO) then
+    proj = dot_product(u, self % norm)
+
+    ! Special case of parallel direction. Particle stays in its current halfspace
+    if (areEqual(proj, ZERO)) then
       halfspace = self % evaluate(r) >= ZERO
+      return
+
     end if
 
+    halfspace = proj > ZERO
+
   end function going
 
   !!

Geometry/Surfaces/QuadSurfaces/sphere_class.f90

@@ -2,7 +2,7 @@ module sphere_class
 
   use numPrecision
   use universalVariables, only : INF, SURF_TOL
-  use genericProcedures,  only : fatalError, dotProduct, numToChar
+  use genericProcedures,  only : fatalError, numToChar
   use dictionary_class,   only : dictionary
   use surface_inter,      only : kill_super => kill
   use quadSurface_inter,  only : quadSurface
@@ -135,7 +135,7 @@ pure function evaluate(self, r) result(c)
 
     diff = r - self % origin
 
-    c = dotProduct(diff, diff) - self % r_sq
+    c = dot_product(diff, diff) - self % r_sq
 
   end function evaluate
 
@@ -158,7 +158,7 @@ pure function distance(self, r, u) result(d)
 
     ! Calculate quadratic components
     c = self % evaluate(r)
-    k = dotProduct(r - self % origin, u)
+    k = dot_product(r - self % origin, u)
     delta = k*k - c  ! Technically delta/4
 
     ! Calculate the distance
@@ -193,7 +193,7 @@ pure function going(self, r, u) result(halfspace)
     real(defReal), dimension(3), intent(in) :: u
     logical(defBool)                        :: halfspace
 
-    halfspace = dotProduct(r - self % origin, u) >= ZERO
+    halfspace = dot_product(r - self % origin, u) >= ZERO
 
   end function going
 

Geometry/Surfaces/box_class.f90

@@ -2,7 +2,7 @@ module box_class
 
   use numPrecision
   use universalVariables
-  use genericProcedures,  only : fatalError, numToChar, swap
+  use genericProcedures,  only : fatalError, numToChar, swap, areEqual
   use dictionary_class,   only : dictionary
   use surface_inter,      only : surface, kill_super => kill
 
@@ -264,14 +264,15 @@ pure function going(self, r, u) result(halfspace)
     ! Projection of direction on the normal
     proj = u(maxCom) * sign(ONE, rl(maxCom))
 
-    halfspace = proj > ZERO
-
-    ! Parallel direction
-    ! Need to use position to determine halfspace
-    if (proj == ZERO) then
+    ! Parallel direction. Need to use position to determine halfspace.
+    if (areEqual(proj, ZERO)) then
       halfspace = self % evaluate(r) >= ZERO
+      return
+
     end if
 
+    halfspace = proj > ZERO
+
   end function going
 
   !!

Geometry/Surfaces/squareCylinder_class.f90

@@ -2,7 +2,7 @@ module squareCylinder_class
 
   use numPrecision
   use universalVariables
-  use genericProcedures,  only : fatalError, numToChar, swap
+  use genericProcedures,  only : fatalError, numToChar, swap, areEqual
   use dictionary_class,   only : dictionary
   use surface_inter,      only : surface, kill_super => kill
 
@@ -313,13 +313,14 @@ pure function going(self, r, u) result(halfspace)
     ! Projection of direction on the normal
     proj = ul(maxCom) * sign(ONE, rl(maxCom))
 
-    halfspace = proj > ZERO
-
-    ! Parallel direction
-    ! Need to use position to determine halfspace
-    if (proj == ZERO) then
+    ! Parallel direction. Need to use position to determine halfspace
+    if (areEqual(proj, ZERO)) then
       halfspace = self % evaluate(r) >= ZERO
+      return
+
     end if
+
+    halfspace = proj > ZERO
 
   end function going
 

Geometry/Surfaces/truncCylinder_class.f90

@@ -2,7 +2,7 @@ module truncCylinder_class
 
   use numPrecision
   use universalVariables
-  use genericProcedures,  only : fatalError, numToChar, swap
+  use genericProcedures,  only : fatalError, numToChar, swap, areEqual
   use dictionary_class,   only : dictionary
   use surface_inter,      only : surface, kill_super => kill
 
@@ -227,7 +227,7 @@ pure function distance(self, r, u) result(d)
     delta = k*k - a*c1  ! Technically delta/4
 
     ! Find closes & furthest distance
-    if (delta <= ZERO .or. a == ZERO) then ! No intersection
+    if (delta <= ZERO .or. areEqual(a, ZERO)) then ! No intersection
       far = INF
       near = sign(INF, c1) ! If ray is parallel inside the cylinder it must be fully contained
 
@@ -328,15 +328,16 @@ pure function going(self, r, u) result(halfspace)
 
     end if
 
-    ! Determine next halfspace
-    halfspace = proj > ZERO
-
-    ! Parallel direction
-    ! Need to use position to determine halfspace
-    if (proj == ZERO) then
+    ! Parallel direction. Need to use position to determine halfspace.
+    if (areEqual(proj, ZERO)) then
       halfspace = c >= ZERO
+      return
+
     end if
 
+    ! Determine next halfspace
+    halfspace = proj > ZERO
+
   end function going
 
   !!

ParticleObjects/particle_class.f90

@@ -394,7 +394,7 @@ end function getUniIdx
   !!
   !! Return current material index
   !!
-  pure function matIdx(self) result(Idx)
+  pure function matIdx(self) result(idx)
     class(particle), intent(in) :: self
     integer(shortInt)           :: idx
 
@@ -670,7 +670,7 @@ end subroutine particleState_fromParticle
   function equal_particleState(LHS,RHS) result(isEqual)
     class(particleState), intent(in) :: LHS
     class(particleState), intent(in) :: RHS
-    logical(defBool)              :: isEqual
+    logical(defBool)                 :: isEqual
 
     isEqual = .true.
     isEqual = isEqual .and. LHS % wgt == RHS % wgt