Merge branch 'add_isBetween' into 'master'

Add is_between

See merge request futility/Futility!337

src/IntrType.f90

@@ -72,6 +72,7 @@ PUBLIC :: SOFTGT
 PUBLIC :: isNAN
 PUBLIC :: isINF
 PUBLIC :: isNumeric
+PUBLIC :: isBetween
 !
 ! Variables
 !> @name Private Variables
@@ -369,6 +370,21 @@ INTERFACE ASSIGNMENT(=)
   !> @copydetails IntrType::assign_char_to_double
   MODULE PROCEDURE assign_char_to_double
 ENDINTERFACE
+
+INTERFACE isBetween
+  !> @copybrief IntrType::isBetween_SNK
+  !> @copydetails IntrType::isBetween_SNK
+  MODULE PROCEDURE isBetween_SNK
+  !> @copybrief IntrType::isBetween_SLK
+  !> @copydetails IntrType::isBetween_SLK
+  MODULE PROCEDURE isBetween_SLK
+  !> @copybrief IntrType::isBetween_SSK
+  !> @copydetails IntrType::isBetween_SSK
+  MODULE PROCEDURE isBetween_SSK
+  !> @copybrief IntrType::isBetween_SDK
+  !> @copydetails IntrType::isBetween_SDK
+  MODULE PROCEDURE isBetween_SDK
+ENDINTERFACE
 !
 !===============================================================================
 CONTAINS
@@ -1030,6 +1046,110 @@ FUNCTION isNumeric(char_str) RESULT(bool)
   bool = .TRUE.
 
 ENDFUNCTION isNumeric
+!
+!-------------------------------------------------------------------------------
+!> @brief Determines if a value is between 2 others
+!> @param a the first bound to check against
+!> @param val the value to compare
+!> @param b the second bound to compare against
+!> @param tolerance an optional tolerance to use for the comparison
+!> @returns between the result of the comparison
+!>
+!> A positive tolerance narrows the range, while a negative tolerance increases it
+!>
+ELEMENTAL FUNCTION isBetween_SNK(a,val,b,tolerance) RESULT(between)
+  INTEGER(SNK),INTENT(IN) :: a
+  INTEGER(SNK),INTENT(IN) :: val
+  INTEGER(SNK),INTENT(IN) :: b
+  INTEGER(SNK),INTENT(IN),OPTIONAL :: tolerance
+  LOGICAL(SBK) :: between
+  !
+  INTEGER(SNK) :: tol
+
+  tol=0
+  IF(PRESENT(tolerance)) tol=tolerance
+
+  between = ((a+tol < val) .AND. (val < b-tol)) .OR. ((b+tol < val) .AND. (val < a-tol))
+
+ENDFUNCTION isBetween_SNK
+!
+!-------------------------------------------------------------------------------
+!> @brief Determines if a value is between 2 others
+!> @param a the first bound to check against
+!> @param val the value to compare
+!> @param b the second bound to compare against
+!> @param tolerance an optional tolerance to use for the comparison
+!> @returns between the result of the comparison
+!>
+!> A positive tolerance narrows the range, while a negative tolerance increases it
+!>
+ELEMENTAL FUNCTION isBetween_SLK(a,val,b,tolerance) RESULT(between)
+  INTEGER(SLK),INTENT(IN) :: a
+  INTEGER(SLK),INTENT(IN) :: val
+  INTEGER(SLK),INTENT(IN) :: b
+  INTEGER(SLK),INTENT(IN),OPTIONAL :: tolerance
+  LOGICAL(SBK) :: between
+  !
+  INTEGER(SLK) :: tol
+
+  tol=0
+  IF(PRESENT(tolerance)) tol=tolerance
+
+  between = ((a+tol < val) .AND. (val < b-tol)) .OR. ((b+tol < val) .AND. (val < a-tol))
+
+ENDFUNCTION isBetween_SLK
+!
+!-------------------------------------------------------------------------------
+!> @brief Determines if a value is between 2 others
+!> @param a the first bound to check against
+!> @param val the value to compare
+!> @param b the second bound to compare against
+!> @param tolerance an optional tolerance to use for the comparison
+!> @returns between the result of the comparison
+!>
+!> A positive tolerance narrows the range, while a negative tolerance increases it
+!>
+ELEMENTAL FUNCTION isBetween_SSK(a,val,b,tolerance) RESULT(between)
+  REAL(SSK),INTENT(IN) :: a
+  REAL(SSK),INTENT(IN) :: val
+  REAL(SSK),INTENT(IN) :: b
+  REAL(SSK),INTENT(IN),OPTIONAL :: tolerance
+  LOGICAL(SBK) :: between
+  !
+  REAL(SSK) :: tol
+
+  tol=0.0_SSK
+  IF(PRESENT(tolerance)) tol=tolerance
 
+  between = ((a+tol < val) .AND. (val < b-tol)) .OR. ((b+tol < val) .AND. (val < a-tol))
+
+ENDFUNCTION isBetween_SSK
+!
+!-------------------------------------------------------------------------------
+!> @brief Determines if a value is between 2 others
+!> @param a the first bound to check against
+!> @param val the value to compare
+!> @param b the second bound to compare against
+!> @param tolerance an optional tolerance to use for the comparison
+!> @returns between the result of the comparison
+!>
+!> A positive tolerance narrows the range, while a negative tolerance increases it
+!>
+ELEMENTAL FUNCTION isBetween_SDK(a,val,b,tolerance) RESULT(between)
+  REAL(SDK),INTENT(IN) :: a
+  REAL(SDK),INTENT(IN) :: val
+  REAL(SDK),INTENT(IN) :: b
+  REAL(SDK),INTENT(IN),OPTIONAL :: tolerance
+  LOGICAL(SBK) :: between
+  !
+  REAL(SDK) :: tol
+
+  tol=0.0_SDK
+  IF(PRESENT(tolerance)) tol=tolerance
+
+  between = ((a+tol < val) .AND. (val < b-tol)) .OR. ((b+tol < val) .AND. (val < a-tol))
+
+ENDFUNCTION isBetween_SDK
+!
 ENDMODULE IntrType
 

unit_tests/CMakeLists.txt

@@ -17,7 +17,7 @@ ADD_SUBDIRECTORY(trilinos_interfaces)
 SET(UNIT_TEST_NAMES
     testDBC
     testUnitTest
-    testSelectedKinds
+    testIntrType
     testIAPWSWaterProperties
     testWaterSatProperties
     testArrayUtils

unit_tests/testSelectedKinds/CMakeLists.txt → unit_tests/testIntrType/CMakeLists.txt

@@ -7,4 +7,4 @@
 # can be found in LICENSE.txt in the head directory of this repository.        !
 #++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++!
 INCLUDE(Futility_CreateUnitTest)
-Futility_CreateUnitTest(testSelectedKinds)
+Futility_CreateUnitTest(testIntrType)

unit_tests/testSelectedKinds/testSelectedKinds.f90 → unit_tests/testIntrType/testIntrType.f90

@@ -6,7 +6,7 @@
 ! of Michigan and Oak Ridge National Laboratory.  The copyright and license    !
 ! can be found in LICENSE.txt in the head directory of this repository.        !
 !++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++!
-PROGRAM testSelectedKinds
+PROGRAM testIntrType
 #include "UnitTest.h"
 USE UnitTest
 USE IntrType
@@ -37,9 +37,7 @@ REGISTER_SUBTEST('CharToInt', testCharToInt)
 REGISTER_SUBTEST('CharToSingle', testCharToSingle)
 REGISTER_SUBTEST('CharToDouble', testCharToDouble)
 REGISTER_SUBTEST('CharToBool', testCharToBool)
-!REGISTER_SUBTEST('CharToIntArray', testCharToIntArray)
-!REGISTER_SUBTEST('CharToDoubleArray', testCharToDoubleArray)
-!REGISTER_SUBTEST('CharToStrArray', testCharToStrArray)
+REGISTER_SUBTEST('isBetween',testIsBetween)
 
 FINALIZE_TEST()
 !
@@ -655,65 +653,225 @@ SUBROUTINE testCharToBool()
 ENDSUBROUTINE testCharToBool
 !
 !-------------------------------------------------------------------------------
-!SUBROUTINE testCharToIntArray()
-!  INTEGER(SIK),ALLOCATABLE :: intArray(:)
-!  CHARACTER(LEN=*),PARAMETER :: ia1='{1,2,3,4,5,6,2394}'
-!  CHARACTER(LEN=*),PARAMETER :: ia2='{10}'
-!  CHARACTER(LEN=*),PARAMETER :: ia3='{}'
-!  CHARACTER(LEN=*),PARAMETER :: ia4='{2147483647,-2147483647,0,-0, -1352}'
-!  LOGICAL(SBK) :: bool
-!  COMPONENT_TEST('Char to Int Array assignment')
-
-!  CALL char_to_int_array(intArray,ia1)
-!  bool=ALL(intArray == (/1,2,3,4,5,6,2394/))
-!  ASSERT(bool, 'Basic char to int array assignment')
-!  CALL char_to_int_array(intArray,ia2)
-!  bool=ALL(intArray == (/10/))
-!  ASSERT(bool, 'Char to int array assignment, one value')
-!  CALL char_to_int_array(intArray,ia3)
-!  ASSERT(.NOT.(ALLOCATED(intArray)), 'Char to int array, empty')
-!  CALL char_to_int_array(intArray,ia4)
-!  bool=ALL(intArray == (/2147483647,-2147483647,0,0/))
-!  ASSERT(bool, 'Char to int array assignment, various values, negatives')
-
-!ENDSUBROUTINE testCharToIntArray
+SUBROUTINE testIsBetween()
+
+  COMPONENT_TEST('SNK')
+  ASSERT(.NOT.isBetween(1_SNK,0_SNK,2_SNK),'1 < 0 < 2')
+  ASSERT(.NOT.isBetween(1_SNK,1_SNK,2_SNK),'1 < 1 < 2')
+  ASSERT(.NOT.isBetween(1_SNK,2_SNK,2_SNK),'1 < 2 < 2')
+  ASSERT(isBetween(1_SNK,2_SNK,3_SNK),'1 < 2 < 3')
+  ASSERT(.NOT.isBetween(1_SNK,3_SNK,2_SNK),'1 < 3 < 2')
+  ASSERT(.NOT.isBetween(1_SNK,1_SNK,1_SNK),'1 < 1 < 1')
+
+  ASSERT(.NOT.isBetween(2_SNK,0_SNK,1_SNK),'2 > 0 > 1')
+  ASSERT(.NOT.isBetween(2_SNK,1_SNK,1_SNK),'2 > 1 > 1')
+  ASSERT(.NOT.isBetween(2_SNK,2_SNK,1_SNK),'2 > 2 > 1')
+  ASSERT(isBetween(3_SNK,2_SNK,1_SNK),'3 > 2 > 1')
+  ASSERT(.NOT.isBetween(2_SNK,3_SNK,1_SNK),'2 > 3 > 1')
+  ASSERT(.NOT.isBetween(1_SNK,1_SNK,1_SNK),'1 > 1 > 1')
+
+  COMPONENT_TEST('SNK, tol')
+  ASSERT(.NOT.isBetween(1_SNK,0_SNK,2_SNK,1_SNK),'1 < 0 < 2')
+  ASSERT(.NOT.isBetween(1_SNK,1_SNK,2_SNK,1_SNK),'1 < 1 < 2')
+  ASSERT(.NOT.isBetween(1_SNK,2_SNK,2_SNK,1_SNK),'1 < 2 < 2')
+  ASSERT(.NOT.isBetween(1_SNK,2_SNK,3_SNK,1_SNK),'1 < 2 < 3')
+  ASSERT(.NOT.isBetween(1_SNK,3_SNK,2_SNK,1_SNK),'1 < 3 < 2')
+  ASSERT(.NOT.isBetween(1_SNK,1_SNK,1_SNK,1_SNK),'1 < 1 < 1')
+
+  ASSERT(.NOT.isBetween(2_SNK,0_SNK,1_SNK,1_SNK),'2 > 0 > 1')
+  ASSERT(.NOT.isBetween(2_SNK,1_SNK,1_SNK,1_SNK),'2 > 1 > 1')
+  ASSERT(.NOT.isBetween(2_SNK,2_SNK,1_SNK,1_SNK),'2 > 2 > 1')
+  ASSERT(.NOT.isBetween(3_SNK,2_SNK,1_SNK,1_SNK),'3 > 2 > 1')
+  ASSERT(.NOT.isBetween(2_SNK,3_SNK,1_SNK,1_SNK),'2 > 3 > 1')
+  ASSERT(.NOT.isBetween(1_SNK,1_SNK,1_SNK,1_SNK),'1 > 1 > 1')
+
+  ASSERT(.NOT.isBetween(1_SNK,0_SNK,2_SNK,-1_SNK),'1 < 0 < 2')
+  ASSERT(isBetween(1_SNK,1_SNK,2_SNK,-1_SNK),'1 < 1 < 2')
+  ASSERT(isBetween(1_SNK,2_SNK,2_SNK,-1_SNK),'1 < 2 < 2')
+  ASSERT(isBetween(1_SNK,2_SNK,3_SNK,-1_SNK),'1 < 2 < 3')
+  ASSERT(.NOT.isBetween(1_SNK,3_SNK,2_SNK,-1_SNK),'1 < 3 < 2')
+  ASSERT(isBetween(1_SNK,1_SNK,1_SNK,-1_SNK),'1 < 1 < 1')
+
+  ASSERT(.NOT.isBetween(2_SNK,0_SNK,1_SNK,-1_SNK),'2 > 0 > 1')
+  ASSERT(isBetween(2_SNK,1_SNK,1_SNK,-1_SNK),'2 > 1 > 1')
+  ASSERT(isBetween(2_SNK,2_SNK,1_SNK,-1_SNK),'2 > 2 > 1')
+  ASSERT(isBetween(3_SNK,2_SNK,1_SNK,-1_SNK),'3 > 2 > 1')
+  ASSERT(.NOT.isBetween(2_SNK,3_SNK,1_SNK,-1_SNK),'2 > 3 > 1')
+  ASSERT(isBetween(1_SNK,1_SNK,1_SNK,-1_SNK),'1 > 1 > 1')
+
+  COMPONENT_TEST('SLK')
+  ASSERT(.NOT.isBetween(1_SLK,0_SLK,2_SLK),'1 < 0 < 2')
+  ASSERT(.NOT.isBetween(1_SLK,1_SLK,2_SLK),'1 < 1 < 2')
+  ASSERT(.NOT.isBetween(1_SLK,2_SLK,2_SLK),'1 < 2 < 2')
+  ASSERT(isBetween(1_SLK,2_SLK,3_SLK),'1 < 2 < 3')
+  ASSERT(.NOT.isBetween(1_SLK,3_SLK,2_SLK),'1 < 3 < 2')
+  ASSERT(.NOT.isBetween(1_SLK,1_SLK,1_SLK),'1 < 1 < 1')
+
+  ASSERT(.NOT.isBetween(2_SLK,0_SLK,1_SLK),'2 > 0 > 1')
+  ASSERT(.NOT.isBetween(2_SLK,1_SLK,1_SLK),'2 > 1 > 1')
+  ASSERT(.NOT.isBetween(2_SLK,2_SLK,1_SLK),'2 > 2 > 1')
+  ASSERT(isBetween(3_SLK,2_SLK,1_SLK),'3 > 2 > 1')
+  ASSERT(.NOT.isBetween(2_SLK,3_SLK,1_SLK),'2 > 3 > 1')
+  ASSERT(.NOT.isBetween(1_SLK,1_SLK,1_SLK),'1 > 1 > 1')
+
+  COMPONENT_TEST('SLK, tol')
+  ASSERT(.NOT.isBetween(1_SLK,0_SLK,2_SLK,1_SLK),'1 < 0 < 2')
+  ASSERT(.NOT.isBetween(1_SLK,1_SLK,2_SLK,1_SLK),'1 < 1 < 2')
+  ASSERT(.NOT.isBetween(1_SLK,2_SLK,2_SLK,1_SLK),'1 < 2 < 2')
+  ASSERT(.NOT.isBetween(1_SLK,2_SLK,3_SLK,1_SLK),'1 < 2 < 3')
+  ASSERT(.NOT.isBetween(1_SLK,3_SLK,2_SLK,1_SLK),'1 < 3 < 2')
+  ASSERT(.NOT.isBetween(1_SLK,1_SLK,1_SLK,1_SLK),'1 < 1 < 1')
+
+  ASSERT(.NOT.isBetween(2_SLK,0_SLK,1_SLK,1_SLK),'2 > 0 > 1')
+  ASSERT(.NOT.isBetween(2_SLK,1_SLK,1_SLK,1_SLK),'2 > 1 > 1')
+  ASSERT(.NOT.isBetween(2_SLK,2_SLK,1_SLK,1_SLK),'2 > 2 > 1')
+  ASSERT(.NOT.isBetween(3_SLK,2_SLK,1_SLK,1_SLK),'3 > 2 > 1')
+  ASSERT(.NOT.isBetween(2_SLK,3_SLK,1_SLK,1_SLK),'2 > 3 > 1')
+  ASSERT(.NOT.isBetween(1_SLK,1_SLK,1_SLK,1_SLK),'1 > 1 > 1')
+
+  ASSERT(.NOT.isBetween(1_SLK,0_SLK,2_SLK,-1_SLK),'1 < 0 < 2')
+  ASSERT(isBetween(1_SLK,1_SLK,2_SLK,-1_SLK),'1 < 1 < 2')
+  ASSERT(isBetween(1_SLK,2_SLK,2_SLK,-1_SLK),'1 < 2 < 2')
+  ASSERT(isBetween(1_SLK,2_SLK,3_SLK,-1_SLK),'1 < 2 < 3')
+  ASSERT(.NOT.isBetween(1_SLK,3_SLK,2_SLK,-1_SLK),'1 < 3 < 2')
+  ASSERT(isBetween(1_SLK,1_SLK,1_SLK,-1_SLK),'1 < 1 < 1')
+
+  ASSERT(.NOT.isBetween(2_SLK,0_SLK,1_SLK,-1_SLK),'2 > 0 > 1')
+  ASSERT(isBetween(2_SLK,1_SLK,1_SLK,-1_SLK),'2 > 1 > 1')
+  ASSERT(isBetween(2_SLK,2_SLK,1_SLK,-1_SLK),'2 > 2 > 1')
+  ASSERT(isBetween(3_SLK,2_SLK,1_SLK,-1_SLK),'3 > 2 > 1')
+  ASSERT(.NOT.isBetween(2_SLK,3_SLK,1_SLK,-1_SLK),'2 > 3 > 1')
+
+  COMPONENT_TEST('SSK')
+  ASSERT(.NOT.isBetween(1.0_SSK,0.0_SSK,2.0_SSK),'1 < 0 < 2')
+  ASSERT(.NOT.isBetween(1.0_SSK,1.0_SSK,2.0_SSK),'1 < 1 < 2')
+  ASSERT(isBetween(1.0_SSK,1.5_SSK,2.0_SSK),'1 < 1.5 < 2')
+  ASSERT(.NOT.isBetween(1.0_SSK,2.0_SSK,2.0_SSK),'1 < 2 < 2')
+  ASSERT(.NOT.isBetween(1.0_SSK,3.0_SSK,2.0_SSK),'1 < 3 < 2')
+  ASSERT(.NOT.isBetween(1.0_SSK,1.0_SSK,2.0_SSK),'1 < 1 < 1')
+
+  ASSERT(.NOT.isBetween(2.0_SSK,0.0_SSK,1.0_SSK),'2 > 0 > 1')
+  ASSERT(.NOT.isBetween(2.0_SSK,1.0_SSK,1.0_SSK),'2 > 1 > 1')
+  ASSERT(isBetween(2.0_SSK,1.5_SSK,1.0_SSK),'2 > 1.5 > 1')
+  ASSERT(.NOT.isBetween(2.0_SSK,2.0_SSK,1.0_SSK),'2 > 2 > 1')
+  ASSERT(.NOT.isBetween(2.0_SSK,3.0_SSK,1.0_SSK),'2 > 3 > 1')
+  ASSERT(.NOT.isBetween(2.0_SSK,1.0_SSK,1.0_SSK),'1 > 1 > 1')
+
+  COMPONENT_TEST('SSK, tol')
+  ASSERT(.NOT.isBetween(1.0_SSK,0.0_SSK,2.0_SSK,0.00001_SSK),'1 < 0 < 2')
+  ASSERT(.NOT.isBetween(1.0_SSK,1.0_SSK,2.0_SSK,0.00001_SSK),'1 < 1 < 2')
+  ASSERT(isBetween(1.0_SSK,1.5_SSK,2.0_SSK,0.00001_SSK),'1 < 1.5 < 2')
+  ASSERT(.NOT.isBetween(1.0_SSK,2.0_SSK,2.0_SSK,0.00001_SSK),'1 < 2 < 2')
+  ASSERT(.NOT.isBetween(1.0_SSK,3.0_SSK,2.0_SSK,0.00001_SSK),'1 < 3 < 2')
+  ASSERT(.NOT.isBetween(1.0_SSK,1.0_SSK,1.0_SSK,0.00001_SSK),'1 < 1 < 1')
+
+  ASSERT(.NOT.isBetween(1.0_SSK,0.0_SSK,2.0_SSK,1.00001_SSK),'1 < 0 < 2')
+  ASSERT(.NOT.isBetween(1.0_SSK,1.0_SSK,2.0_SSK,1.00001_SSK),'1 < 1 < 2')
+  ASSERT(.NOT.isBetween(1.0_SSK,1.5_SSK,2.0_SSK,1.00001_SSK),'1 < 1.5 < 2')
+  ASSERT(.NOT.isBetween(1.0_SSK,2.0_SSK,2.0_SSK,1.00001_SSK),'1 < 2 < 2')
+  ASSERT(.NOT.isBetween(1.0_SSK,3.0_SSK,2.0_SSK,1.00001_SSK),'1 < 3 < 2')
+  ASSERT(.NOT.isBetween(1.0_SSK,1.0_SSK,1.0_SSK,1.00001_SSK),'1 < 1 < 1')
+
+  ASSERT(.NOT.isBetween(1.0_SSK,0.0_SSK,2.0_SSK,-0.00001_SSK),'1 < 0 < 2')
+  ASSERT(isBetween(1.0_SSK,1.0_SSK,2.0_SSK,-0.00001_SSK),'1 < 1 < 2')
+  ASSERT(isBetween(1.0_SSK,1.5_SSK,2.0_SSK,-0.00001_SSK),'1 < 1.5 < 2')
+  ASSERT(isBetween(1.0_SSK,2.0_SSK,2.0_SSK,-0.00001_SSK),'1 < 2 < 2')
+  ASSERT(.NOT.isBetween(1.0_SSK,3.0_SSK,2.0_SSK,-0.00001_SSK),'1 < 3 < 2')
+  ASSERT(isBetween(1.0_SSK,1.0_SSK,1.0_SSK,-0.00001_SSK),'1 < 1 < 1')
+
+  ASSERT(isBetween(1.0_SSK,0.0_SSK,2.0_SSK,-1.00001_SSK),'1 < 0 < 2')
+  ASSERT(isBetween(1.0_SSK,1.0_SSK,2.0_SSK,-1.00001_SSK),'1 < 1 < 2')
+  ASSERT(isBetween(1.0_SSK,1.5_SSK,2.0_SSK,-1.00001_SSK),'1 < 1.5 < 2')
+  ASSERT(isBetween(1.0_SSK,2.0_SSK,2.0_SSK,-1.00001_SSK),'1 < 2 < 2')
+  ASSERT(isBetween(1.0_SSK,3.0_SSK,2.0_SSK,-1.00001_SSK),'1 < 3 < 2')
+  ASSERT(isBetween(1.0_SSK,1.0_SSK,1.0_SSK,-1.00001_SSK),'1 < 1 < 1')
+
+  ASSERT(.NOT.isBetween(2.0_SSK,0.0_SSK,1.0_SSK,0.00001_SSK),'2 > 0 > 1')
+  ASSERT(.NOT.isBetween(2.0_SSK,1.0_SSK,1.0_SSK,0.00001_SSK),'2 > 1 > 1')
+  ASSERT(isBetween(2.0_SSK,1.5_SSK,1.0_SSK,0.00001_SSK),'2 > 1.5 > 1')
+  ASSERT(.NOT.isBetween(2.0_SSK,2.0_SSK,1.0_SSK,0.00001_SSK),'2 > 2 > 1')
+  ASSERT(.NOT.isBetween(2.0_SSK,3.0_SSK,1.0_SSK,0.00001_SSK),'2 > 3 > 1')
+  ASSERT(.NOT.isBetween(1.0_SSK,1.0_SSK,1.0_SSK,0.00001_SSK),'1 > 1 > 1')
+
+  ASSERT(.NOT.isBetween(2.0_SSK,0.0_SSK,1.0_SSK,1.00001_SSK),'2 > 0 > 1')
+  ASSERT(.NOT.isBetween(2.0_SSK,1.0_SSK,1.0_SSK,1.00001_SSK),'2 > 1 > 1')
+  ASSERT(.NOT.isBetween(2.0_SSK,1.5_SSK,1.0_SSK,1.00001_SSK),'2 > 1.5 > 1')
+  ASSERT(.NOT.isBetween(2.0_SSK,2.0_SSK,1.0_SSK,1.00001_SSK),'2 > 2 > 1')
+  ASSERT(.NOT.isBetween(2.0_SSK,3.0_SSK,1.0_SSK,1.00001_SSK),'2 > 3 > 1')
+  ASSERT(.NOT.isBetween(1.0_SSK,1.0_SSK,1.0_SSK,1.00001_SSK),'1 > 1 > 1')
+
+  ASSERT(.NOT.isBetween(2.0_SSK,0.0_SSK,1.0_SSK,-0.00001_SSK),'2 > 0 > 1')
+  ASSERT(isBetween(2.0_SSK,1.0_SSK,1.0_SSK,-0.00001_SSK),'2 > 1 > 1')
+  ASSERT(isBetween(2.0_SSK,1.5_SSK,1.0_SSK,-0.00001_SSK),'2 > 1.5 > 1')
+  ASSERT(isBetween(2.0_SSK,2.0_SSK,1.0_SSK,-0.00001_SSK),'2 > 2 > 1')
+  ASSERT(.NOT.isBetween(2.0_SSK,3.0_SSK,1.0_SSK,-0.00001_SSK),'2 > 3 > 1')
+  ASSERT(isBetween(1.0_SSK,1.0_SSK,1.0_SSK,-0.00001_SSK),'1 > 1 > 1')
+
+  ASSERT(isBetween(2.0_SSK,0.0_SSK,1.0_SSK,-1.00001_SSK),'2 > 0 > 1')
+  ASSERT(isBetween(2.0_SSK,1.0_SSK,1.0_SSK,-1.00001_SSK),'2 > 1 > 1')
+  ASSERT(isBetween(2.0_SSK,1.5_SSK,1.0_SSK,-1.00001_SSK),'2 > 1.5 > 1')
+  ASSERT(isBetween(2.0_SSK,2.0_SSK,1.0_SSK,-1.00001_SSK),'2 > 2 > 1')
+  ASSERT(isBetween(2.0_SSK,3.0_SSK,1.0_SSK,-1.00001_SSK),'2 > 3 > 1')
+  ASSERT(isBetween(1.0_SSK,1.0_SSK,1.0_SSK,-1.00001_SSK),'1 > 1 > 1')
+
+  COMPONENT_TEST('SDK, tol')
+  ASSERT(.NOT.isBetween(1.0_SDK,0.0_SDK,2.0_SDK,0.00001_SDK),'1 < 0 < 2')
+  ASSERT(.NOT.isBetween(1.0_SDK,1.0_SDK,2.0_SDK,0.00001_SDK),'1 < 1 < 2')
+  ASSERT(isBetween(1.0_SDK,1.5_SDK,2.0_SDK,0.00001_SDK),'1 < 1.5 < 2')
+  ASSERT(.NOT.isBetween(1.0_SDK,2.0_SDK,2.0_SDK,0.00001_SDK),'1 < 2 < 2')
+  ASSERT(.NOT.isBetween(1.0_SDK,3.0_SDK,2.0_SDK,0.00001_SDK),'1 < 3 < 2')
+  ASSERT(.NOT.isBetween(1.0_SDK,1.0_SDK,1.0_SDK,0.00001_SDK),'1 < 1 < 1')
+
+  ASSERT(.NOT.isBetween(1.0_SDK,0.0_SDK,2.0_SDK,1.00001_SDK),'1 < 0 < 2')
+  ASSERT(.NOT.isBetween(1.0_SDK,1.0_SDK,2.0_SDK,1.00001_SDK),'1 < 1 < 2')
+  ASSERT(.NOT.isBetween(1.0_SDK,1.5_SDK,2.0_SDK,1.00001_SDK),'1 < 1.5 < 2')
+  ASSERT(.NOT.isBetween(1.0_SDK,2.0_SDK,2.0_SDK,1.00001_SDK),'1 < 2 < 2')
+  ASSERT(.NOT.isBetween(1.0_SDK,3.0_SDK,2.0_SDK,1.00001_SDK),'1 < 3 < 2')
+  ASSERT(.NOT.isBetween(1.0_SDK,1.0_SDK,1.0_SDK,1.00001_SDK),'1 < 1 < 1')
+
+  ASSERT(.NOT.isBetween(1.0_SDK,0.0_SDK,2.0_SDK,-0.00001_SDK),'1 < 0 < 2')
+  ASSERT(isBetween(1.0_SDK,1.0_SDK,2.0_SDK,-0.00001_SDK),'1 < 1 < 2')
+  ASSERT(isBetween(1.0_SDK,1.5_SDK,2.0_SDK,-0.00001_SDK),'1 < 1.5 < 2')
+  ASSERT(isBetween(1.0_SDK,2.0_SDK,2.0_SDK,-0.00001_SDK),'1 < 2 < 2')
+  ASSERT(.NOT.isBetween(1.0_SDK,3.0_SDK,2.0_SDK,-0.00001_SDK),'1 < 3 < 2')
+  ASSERT(isBetween(1.0_SDK,1.0_SDK,1.0_SDK,-0.00001_SDK),'1 < 1 < 1')
+
+  ASSERT(isBetween(1.0_SDK,0.0_SDK,2.0_SDK,-1.00001_SDK),'1 < 0 < 2')
+  ASSERT(isBetween(1.0_SDK,1.0_SDK,2.0_SDK,-1.00001_SDK),'1 < 1 < 2')
+  ASSERT(isBetween(1.0_SDK,1.5_SDK,2.0_SDK,-1.00001_SDK),'1 < 1.5 < 2')
+  ASSERT(isBetween(1.0_SDK,2.0_SDK,2.0_SDK,-1.00001_SDK),'1 < 2 < 2')
+  ASSERT(isBetween(1.0_SDK,3.0_SDK,2.0_SDK,-1.00001_SDK),'1 < 3 < 2')
+  ASSERT(isBetween(1.0_SDK,1.0_SDK,1.0_SDK,-1.00001_SDK),'1 < 1 < 1')
+
+  ASSERT(.NOT.isBetween(2.0_SDK,0.0_SDK,1.0_SDK,0.00001_SDK),'2 > 0 > 1')
+  ASSERT(.NOT.isBetween(2.0_SDK,1.0_SDK,1.0_SDK,0.00001_SDK),'2 > 1 > 1')
+  ASSERT(isBetween(2.0_SDK,1.5_SDK,1.0_SDK,0.00001_SDK),'2 > 1.5 > 1')
+  ASSERT(.NOT.isBetween(2.0_SDK,2.0_SDK,1.0_SDK,0.00001_SDK),'2 > 2 > 1')
+  ASSERT(.NOT.isBetween(2.0_SDK,3.0_SDK,1.0_SDK,0.00001_SDK),'2 > 3 > 1')
+  ASSERT(.NOT.isBetween(1.0_SDK,1.0_SDK,1.0_SDK,0.00001_SDK),'1 > 1 > 1')
+
+  ASSERT(.NOT.isBetween(2.0_SDK,0.0_SDK,1.0_SDK,1.00001_SDK),'2 > 0 > 1')
+  ASSERT(.NOT.isBetween(2.0_SDK,1.0_SDK,1.0_SDK,1.00001_SDK),'2 > 1 > 1')
+  ASSERT(.NOT.isBetween(2.0_SDK,1.5_SDK,1.0_SDK,1.00001_SDK),'2 > 1.5 > 1')
+  ASSERT(.NOT.isBetween(2.0_SDK,2.0_SDK,1.0_SDK,1.00001_SDK),'2 > 2 > 1')
+  ASSERT(.NOT.isBetween(2.0_SDK,3.0_SDK,1.0_SDK,1.00001_SDK),'2 > 3 > 1')
+  ASSERT(.NOT.isBetween(1.0_SDK,1.0_SDK,1.0_SDK,1.00001_SDK),'1 > 1 > 1')
+
+  ASSERT(.NOT.isBetween(2.0_SDK,0.0_SDK,1.0_SDK,-0.00001_SDK),'2 > 0 > 1')
+  ASSERT(isBetween(2.0_SDK,1.0_SDK,1.0_SDK,-0.00001_SDK),'2 > 1 > 1')
+  ASSERT(isBetween(2.0_SDK,1.5_SDK,1.0_SDK,-0.00001_SDK),'2 > 1.5 > 1')
+  ASSERT(isBetween(2.0_SDK,2.0_SDK,1.0_SDK,-0.00001_SDK),'2 > 2 > 1')
+  ASSERT(.NOT.isBetween(2.0_SDK,3.0_SDK,1.0_SDK,-0.00001_SDK),'2 > 3 > 1')
+  ASSERT(isBetween(1.0_SDK,1.0_SDK,1.0_SDK,-0.00001_SDK),'1 > 1 > 1')
+
+  ASSERT(isBetween(2.0_SDK,0.0_SDK,1.0_SDK,-1.00001_SDK),'2 > 0 > 1')
+  ASSERT(isBetween(2.0_SDK,1.0_SDK,1.0_SDK,-1.00001_SDK),'2 > 1 > 1')
+  ASSERT(isBetween(2.0_SDK,1.5_SDK,1.0_SDK,-1.00001_SDK),'2 > 1.5 > 1')
+  ASSERT(isBetween(2.0_SDK,2.0_SDK,1.0_SDK,-1.00001_SDK),'2 > 2 > 1')
+  ASSERT(isBetween(2.0_SDK,3.0_SDK,1.0_SDK,-1.00001_SDK),'2 > 3 > 1')
+  ASSERT(isBetween(1.0_SDK,1.0_SDK,1.0_SDK,-1.00001_SDK),'1 > 1 > 1')
+
+ENDSUBROUTINE testIsBetween
 !
-!---!----------------------------------------------------------------------------
-!SUBROUTINE testCharToDoubleArray()
-!  REAL(SDK),ALLOCATABLE :: doubleArray(:)
-!  CHARACTER(LEN=*),PARAMETER :: da1='{1.0,2.1,3.2,4.5,235.235}'
-!  CHARACTER(LEN=*),PARAMETER :: da2='{-734723741.000033,2147483647.2147483647}'
-!  CHARACTER(LEN=*),PARAMETER :: da3='{1e5,1e-5,1.351632e12,-4.324E-2}'
-!  CHARACTER(LEN=*),PARAMETER :: da4='{8.2085e+05,1.1109e+05,5.5308e+03,&
-!    1.8644e+02,3.7612e+01,3.5379e+01,2.7697e+01,2.1684e+01,2.0397e+01,&
-!      1.5968e+01,7.1500e+00,6.7000e+00,6.3000e+00,1.0970e+00,1.0450e+00,&
-!      9.5000e-01,3.5000e-01,2.0600e-01,1.0700e-01,5.8000e-02,2.5000e-02,&
-!      1.0000e-02,1.0000e-05}'
-!  LOGICAL(SBK) :: bool
-!  COMPONENT_TEST('Char to Double Array assignment')
-
-!  CALL char_to_double_array(doubleArray,da1)
-!  bool=ALL(doubleArray .APPROXEQF. (/1.0_SDK,2.1_SDK,3.2_SDK,4.5_SDK,235.235_SDK/))
-!  ASSERT(bool, 'Char to double array assignment')
-!  CALL char_to_double_array(doubleArray,da2)
-!  bool=ALL(doubleArray .APPROXEQF. (/-734723741.000033_SDK,2147483647.2147483647_SDK/))
-!  ASSERT(bool, 'Char to double array assignment, big numbers')
-!  CALL char_to_double_array(doubleArray,da3)
-!  bool=ALL(doubleArray .APPROXEQF. (/1e5_SDK,1e-5_SDK,1.351632e12_SDK,-4.324E-2_SDK/))
-!  ASSERT(bool, 'Char to double array assignment, scientific notation')
-!  CALL char_to_double_array(doubleArray,da4)
-!  bool=ALL(doubleArray .APPROXEQF. (/8.2085e+05_SDK,1.1109e+05_SDK,5.5308e+03_SDK,&
-!    1.8644e+02_SDK,3.7612e+01_SDK,3.5379e+01_SDK,2.7697e+01_SDK,2.1684e+01_SDK,2.0397e+01_SDK,&
-!      1.5968e+01_SDK,7.1500e+00_SDK,6.7000e+00_SDK,6.3000e+00_SDK,1.0970e+00_SDK,1.0450e+00_SDK,&
-!      9.5000e-01_SDK,3.5000e-01_SDK,2.0600e-01_SDK,1.0700e-01_SDK,5.8000e-02_SDK,2.5000e-02_SDK,&
-!      1.0000e-02_SDK,1.0000e-05_SDK/))
-!  ASSERT(bool, 'Char to double array, large array')
-!ENDSUBROUTINE testCharToDoubleArray
-!
-!-------------------------------------------------------------------------------
-!SUBROUTINE testCharToStrArray()
-!  COMPONENT_TEST('Char to String Array assignment')
-!ENDSUBROUTINE testCharToStrArray
-!
-ENDPROGRAM testSelectedKinds
+ENDPROGRAM testIntrType