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

changed misplaced private to public statement and renamed qsort to math_qsort

This commit is contained in:
Martin Diehl 2013-02-01 07:26:21 +00:00
parent e74b5da19a
commit c2495d0d4a
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/math.f90
View File

@ -144,6 +144,7 @@ real(pReal), dimension(4,36), parameter, private :: &
public :: & public :: &
math_init, & math_init, &
math_qsort, &
math_range, & math_range, &
math_identity2nd, & math_identity2nd, &
math_identity4th, & math_identity4th, &
@ -235,7 +236,6 @@ real(pReal), dimension(4,36), parameter, private :: &
#endif #endif
private :: & private :: &
qsort, &
math_partition, & math_partition, &
halton, & halton, &
halton_memory, & halton_memory, &
@ -346,7 +346,7 @@ end subroutine math_init
! Sorting is done with respect to array(1,:) ! Sorting is done with respect to array(1,:)
! and keeps array(2:N,:) linked to it. ! and keeps array(2:N,:) linked to it.
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
recursive subroutine qsort(a, istart, iend) recursive subroutine math_qsort(a, istart, iend)
implicit none implicit none
integer(pInt), dimension(:,:), intent(inout) :: a integer(pInt), dimension(:,:), intent(inout) :: a
@ -355,11 +355,11 @@ recursive subroutine qsort(a, istart, iend)
if (istart < iend) then if (istart < iend) then
ipivot = math_partition(a,istart, iend) ipivot = math_partition(a,istart, iend)
call qsort(a, istart, ipivot-1_pInt) call math_qsort(a, istart, ipivot-1_pInt)
call qsort(a, ipivot+1_pInt, iend) call math_qsort(a, ipivot+1_pInt, iend)
endif endif
end subroutine qsort end subroutine math_qsort
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------

16
code/mesh.f90
View File

@ -2383,7 +2383,7 @@ subroutine mesh_marc_count_cpElements(myUnit)
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine mesh_marc_map_elements(myUnit) subroutine mesh_marc_map_elements(myUnit)
use math, only: qsort use math, only: math_qsort
use IO, only: IO_lc, & use IO, only: IO_lc, &
IO_stringValue, & IO_stringValue, &
IO_stringPos, & IO_stringPos, &
@ -2421,7 +2421,7 @@ subroutine mesh_marc_map_elements(myUnit)
endif endif
enddo enddo
660 call qsort(mesh_mapFEtoCPelem,1_pInt,int(size(mesh_mapFEtoCPelem,2_pInt),pInt)) ! should be mesh_NcpElems 660 call math_qsort(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
@ -2432,7 +2432,7 @@ end subroutine mesh_marc_map_elements
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine mesh_marc_map_nodes(myUnit) subroutine mesh_marc_map_nodes(myUnit)
use math, only: qsort use math, only: math_qsort
use IO, only: IO_lc, & use IO, only: IO_lc, &
IO_stringValue, & IO_stringValue, &
IO_stringPos, & IO_stringPos, &
@ -2469,7 +2469,7 @@ subroutine mesh_marc_map_nodes(myUnit)
endif endif
enddo enddo
650 call qsort(mesh_mapFEtoCPnode,1_pInt,int(size(mesh_mapFEtoCPnode,2_pInt),pInt)) 650 call math_qsort(mesh_mapFEtoCPnode,1_pInt,int(size(mesh_mapFEtoCPnode,2_pInt),pInt))
end subroutine mesh_marc_map_nodes end subroutine mesh_marc_map_nodes
@ -2995,7 +2995,7 @@ end subroutine mesh_abaqus_count_cpElements
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine mesh_abaqus_map_elements(myUnit) subroutine mesh_abaqus_map_elements(myUnit)
use math, only: qsort use math, only: math_qsort
use IO, only: IO_lc, & use IO, only: IO_lc, &
IO_stringValue, & IO_stringValue, &
IO_stringPos, & IO_stringPos, &
@ -3045,7 +3045,7 @@ subroutine mesh_abaqus_map_elements(myUnit)
endselect endselect
enddo enddo
660 call qsort(mesh_mapFEtoCPelem,1_pInt,int(size(mesh_mapFEtoCPelem,2_pInt),pInt)) ! should be mesh_NcpElems 660 call math_qsort(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)
@ -3058,7 +3058,7 @@ end subroutine mesh_abaqus_map_elements
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine mesh_abaqus_map_nodes(myUnit) subroutine mesh_abaqus_map_nodes(myUnit)
use math, only: qsort use math, only: math_qsort
use IO, only: IO_lc, & use IO, only: IO_lc, &
IO_stringValue, & IO_stringValue, &
IO_stringPos, & IO_stringPos, &
@ -3109,7 +3109,7 @@ subroutine mesh_abaqus_map_nodes(myUnit)
endif endif
enddo enddo
650 call qsort(mesh_mapFEtoCPnode,1_pInt,int(size(mesh_mapFEtoCPnode,2_pInt),pInt)) 650 call math_qsort(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)