223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

don't put implementation details in function name

This commit is contained in:
Martin Diehl 2019-05-10 15:03:54 +02:00
parent c81a90350c
commit 811fc5c30c
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/math.f90
View File

@ -83,7 +83,7 @@ module math
public :: & public :: &
math_init, & math_init, &
math_qsort, & math_sort, &
math_expand, & math_expand, &
math_range, & math_range, &
math_identity2nd, & 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. ! Sorting is done with respect to array(sort,:) and keeps array(/=sort,:) linked to it.
! default: sort=1 ! default: sort=1
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
recursive subroutine math_qsort(a, istart, iend, sortDim) recursive subroutine math_sort(a, istart, iend, sortDim)
implicit none implicit none
integer, dimension(:,:), intent(inout) :: a integer, dimension(:,:), intent(inout) :: a
@ -255,8 +255,8 @@ recursive subroutine math_qsort(a, istart, iend, sortDim)
if (s < e) then if (s < e) then
ipivot = qsort_partition(a,s, e, d) ipivot = qsort_partition(a,s, e, d)
call math_qsort(a, s, ipivot-1, d) call math_sort(a, s, ipivot-1, d)
call math_qsort(a, ipivot+1, e, d) call math_sort(a, ipivot+1, e, d)
endif endif
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
@ -297,7 +297,7 @@ recursive subroutine math_qsort(a, istart, iend, sortDim)
end function qsort_partition end function qsort_partition
end subroutine math_qsort end subroutine math_sort
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------

8
src/mesh_abaqus.f90
View File

@ -884,7 +884,7 @@ end subroutine mesh_abaqus_count_cpElements
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine mesh_abaqus_map_elements(fileUnit) subroutine mesh_abaqus_map_elements(fileUnit)
use math, only: math_qsort use math, only: math_sort
use IO, only: IO_lc, & use IO, only: IO_lc, &
IO_stringValue, & IO_stringValue, &
IO_stringPos, & IO_stringPos, &
@ -935,7 +935,7 @@ subroutine mesh_abaqus_map_elements(fileUnit)
endselect endselect
enddo 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) 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) subroutine mesh_abaqus_map_nodes(fileUnit)
use math, only: math_qsort use math, only: math_sort
use IO, only: IO_lc, & use IO, only: IO_lc, &
IO_stringValue, & IO_stringValue, &
IO_stringPos, & IO_stringPos, &
@ -999,7 +999,7 @@ subroutine mesh_abaqus_map_nodes(fileUnit)
endif endif
enddo 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) if (int(size(mesh_mapFEtoCPnode),pInt) == 0_pInt) call IO_error(error_ID=908_pInt)

8
src/mesh_marc.f90
View File

@ -640,7 +640,7 @@ subroutine mesh_marc_map_elementSets(nameElemSet,mapElemSet,fileUnit)
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine mesh_marc_map_elements(tableStyle,nameElemSet,mapElemSet,nElems,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, & use IO, only: IO_lc, &
IO_intValue, & IO_intValue, &
IO_stringValue, & IO_stringValue, &
@ -701,7 +701,7 @@ subroutine mesh_marc_map_elements(tableStyle,nameElemSet,mapElemSet,nElems,fileU
mesh_mapFEtoCPelem(2,cpElem) = cpElem mesh_mapFEtoCPelem(2,cpElem) = cpElem
enddo 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 end subroutine mesh_marc_map_elements
@ -711,7 +711,7 @@ end subroutine mesh_marc_map_elements
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine mesh_marc_map_nodes(nNodes,fileUnit) subroutine mesh_marc_map_nodes(nNodes,fileUnit)
use math, only: math_qsort use math, only: math_sort
use IO, only: IO_lc, & use IO, only: IO_lc, &
IO_stringValue, & IO_stringValue, &
IO_stringPos, & IO_stringPos, &
@ -743,7 +743,7 @@ subroutine mesh_marc_map_nodes(nNodes,fileUnit)
endif endif
enddo 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 end subroutine mesh_marc_map_nodes