diff --git a/src/math.f90 b/src/math.f90 index d61ca2c90..c3aab9936 100644 --- a/src/math.f90 +++ b/src/math.f90 @@ -83,7 +83,7 @@ module math public :: & math_init, & - math_qsort, & + math_sort, & math_expand, & math_range, & math_identity2nd, & @@ -228,7 +228,7 @@ end subroutine math_check ! Sorting is done with respect to array(sort,:) and keeps array(/=sort,:) linked to it. ! default: sort=1 !-------------------------------------------------------------------------------------------------- -recursive subroutine math_qsort(a, istart, iend, sortDim) +recursive subroutine math_sort(a, istart, iend, sortDim) implicit none integer, dimension(:,:), intent(inout) :: a @@ -255,8 +255,8 @@ recursive subroutine math_qsort(a, istart, iend, sortDim) if (s < e) then ipivot = qsort_partition(a,s, e, d) - call math_qsort(a, s, ipivot-1, d) - call math_qsort(a, ipivot+1, e, d) + call math_sort(a, s, ipivot-1, d) + call math_sort(a, ipivot+1, e, d) endif !-------------------------------------------------------------------------------------------------- @@ -297,7 +297,7 @@ recursive subroutine math_qsort(a, istart, iend, sortDim) end function qsort_partition -end subroutine math_qsort +end subroutine math_sort !-------------------------------------------------------------------------------------------------- diff --git a/src/mesh_abaqus.f90 b/src/mesh_abaqus.f90 index adcaa8513..15369db44 100644 --- a/src/mesh_abaqus.f90 +++ b/src/mesh_abaqus.f90 @@ -884,7 +884,7 @@ end subroutine mesh_abaqus_count_cpElements !-------------------------------------------------------------------------------------------------- subroutine mesh_abaqus_map_elements(fileUnit) - use math, only: math_qsort + use math, only: math_sort use IO, only: IO_lc, & IO_stringValue, & IO_stringPos, & @@ -935,7 +935,7 @@ subroutine mesh_abaqus_map_elements(fileUnit) endselect enddo - call math_qsort(mesh_mapFEtoCPelem,1_pInt,int(size(mesh_mapFEtoCPelem,2_pInt),pInt)) ! should be mesh_NcpElems + call math_sort(mesh_mapFEtoCPelem,1_pInt,int(size(mesh_mapFEtoCPelem,2_pInt),pInt)) ! should be mesh_NcpElems if (int(size(mesh_mapFEtoCPelem),pInt) < 2_pInt) call IO_error(error_ID=907_pInt) @@ -948,7 +948,7 @@ end subroutine mesh_abaqus_map_elements !-------------------------------------------------------------------------------------------------- subroutine mesh_abaqus_map_nodes(fileUnit) - use math, only: math_qsort + use math, only: math_sort use IO, only: IO_lc, & IO_stringValue, & IO_stringPos, & @@ -999,7 +999,7 @@ subroutine mesh_abaqus_map_nodes(fileUnit) endif enddo - call math_qsort(mesh_mapFEtoCPnode,1_pInt,int(size(mesh_mapFEtoCPnode,2_pInt),pInt)) + call math_sort(mesh_mapFEtoCPnode,1_pInt,int(size(mesh_mapFEtoCPnode,2_pInt),pInt)) if (int(size(mesh_mapFEtoCPnode),pInt) == 0_pInt) call IO_error(error_ID=908_pInt) diff --git a/src/mesh_marc.f90 b/src/mesh_marc.f90 index c999e32d5..575792a14 100644 --- a/src/mesh_marc.f90 +++ b/src/mesh_marc.f90 @@ -640,7 +640,7 @@ subroutine mesh_marc_map_elementSets(nameElemSet,mapElemSet,fileUnit) !-------------------------------------------------------------------------------------------------- subroutine mesh_marc_map_elements(tableStyle,nameElemSet,mapElemSet,nElems,fileUnit) - use math, only: math_qsort + use math, only: math_sort use IO, only: IO_lc, & IO_intValue, & IO_stringValue, & @@ -701,7 +701,7 @@ subroutine mesh_marc_map_elements(tableStyle,nameElemSet,mapElemSet,nElems,fileU mesh_mapFEtoCPelem(2,cpElem) = cpElem enddo -call math_qsort(mesh_mapFEtoCPelem,1_pInt,int(size(mesh_mapFEtoCPelem,2_pInt),pInt)) ! should be mesh_NcpElems +call math_sort(mesh_mapFEtoCPelem,1_pInt,int(size(mesh_mapFEtoCPelem,2_pInt),pInt)) ! should be mesh_NcpElems end subroutine mesh_marc_map_elements @@ -711,7 +711,7 @@ end subroutine mesh_marc_map_elements !-------------------------------------------------------------------------------------------------- subroutine mesh_marc_map_nodes(nNodes,fileUnit) - use math, only: math_qsort + use math, only: math_sort use IO, only: IO_lc, & IO_stringValue, & IO_stringPos, & @@ -743,7 +743,7 @@ subroutine mesh_marc_map_nodes(nNodes,fileUnit) endif enddo -650 call math_qsort(mesh_mapFEtoCPnode,1_pInt,int(size(mesh_mapFEtoCPnode,2_pInt),pInt)) +650 call math_sort(mesh_mapFEtoCPnode,1_pInt,int(size(mesh_mapFEtoCPnode,2_pInt),pInt)) end subroutine mesh_marc_map_nodes