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

changed MPIE_NUM_THREADS to DAMASK_NUM_THREADS

This commit is contained in:
Franz Roters 2011-05-28 09:42:25 +00:00
parent 5e6de13962
commit 2418dfe96d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/DAMASK_marc.f90
View File

@ -233,7 +233,7 @@ subroutine hypela2(&
use mesh, only: mesh_FEasCP use mesh, only: mesh_FEasCP
use CPFEM, only: CPFEM_initAll,CPFEM_general,CPFEM_init_done use CPFEM, only: CPFEM_initAll,CPFEM_general,CPFEM_init_done
!$ use OMP_LIB ! the openMP function library !$ use OMP_LIB ! the openMP function library
!$ use numerics, only: mpieNumThreadsInt ! number of threads set by MPIE_NUMTHREADS !$ use numerics, only: DAMASK_NumThreadsInt ! number of threads set by DAMASK_NUM_THREADS
implicit none implicit none
! ** Start of generated type statements ** ! ** Start of generated type statements **
@ -269,7 +269,7 @@ subroutine hypela2(&
if (.not. CPFEM_init_done) call CPFEM_initAll(t(1),n(1),nn) if (.not. CPFEM_init_done) call CPFEM_initAll(t(1),n(1),nn)
!$ call omp_set_num_threads(mpieNumThreadsInt) ! set number of threads for parallel execution set by MPIE_NUM_THREADS !$ call omp_set_num_threads(DAMASK_NumThreadsInt) ! set number of threads for parallel execution set by DAMASK_NUM_THREADS
if (lovl == 4) then ! Marc requires stiffness in separate call if (lovl == 4) then ! Marc requires stiffness in separate call
if ( timinc < theDelta .and. theInc == inc ) then ! first after cutback if ( timinc < theDelta .and. theInc == inc ) then ! first after cutback

16
code/numerics.f90
View File

@ -76,7 +76,7 @@ integer(pInt) itmax , & ! maximu
!* Random seeding parameters !* Random seeding parameters
fixedSeed ! fixed seeding for pseudo-random number generator fixedSeed ! fixed seeding for pseudo-random number generator
!* OpenMP variable !* OpenMP variable
!$ integer(pInt) mpieNumThreadsInt ! value stored in environment variable MPIE_NUM_THREADS !$ integer(pInt) DAMASK_NumThreadsInt ! value stored in environment variable DAMASK_NUM_THREADS
CONTAINS CONTAINS
@ -113,7 +113,7 @@ subroutine numerics_init()
character(len=1024) line character(len=1024) line
! OpenMP variable ! OpenMP variable
!$ character(len=4) mpieNumThreadsString !environment variable MPIE_NUMTHREADS !$ character(len=4) DAMASK_NumThreadsString !environment variable DAMASK_NUM_THREADS
!$OMP CRITICAL (write2out) !$OMP CRITICAL (write2out)
write(6,*) write(6,*)
@ -173,11 +173,11 @@ subroutine numerics_init()
fixedSeed = 0_pInt fixedSeed = 0_pInt
!* determin number of threads from environment variable MPIE_NUM_THREADS !* determin number of threads from environment variable DAMASK_NUM_THREADS
!$ call GetEnv('MPIE_NUM_THREADS',mpieNumThreadsString) ! get environment variable MPIE_NUM_THREADS... !$ call GetEnv('DAMASK_NUM_THREADS',DAMASK_NumThreadsString) ! get environment variable DAMASK_NUM_THREADS...
!$ read(mpieNumThreadsString,'(i4)') mpieNumThreadsInt ! ...convert it to integer... !$ read(DAMASK_NumThreadsString,'(i4)') DAMASK_NumThreadsInt ! ...convert it to integer...
!$ if (mpieNumThreadsInt < 1) mpieNumThreadsInt = 1 ! ...ensure that its at least one... !$ if (DAMASK_NumThreadsInt < 1) DAMASK_NumThreadsInt = 1 ! ...ensure that its at least one...
!$ call omp_set_num_threads(mpieNumThreadsInt) ! ...and use it as number of threads for parallel execution !$ call omp_set_num_threads(DAMASK_NumThreadsInt) ! ...and use it as number of threads for parallel execution
! try to open the config file ! try to open the config file
if(IO_open_file(fileunit,numerics_configFile)) then if(IO_open_file(fileunit,numerics_configFile)) then
@ -356,7 +356,7 @@ subroutine numerics_init()
!$OMP END CRITICAL (write2out) !$OMP END CRITICAL (write2out)
!* openMP parameter !* openMP parameter
!$ write(6,'(a24,x,i8)') 'number of threads: ',OMP_get_max_threads() !$ write(6,'(a24,x,i8)') 'number of threads: ',DAMASK_NumThreadsInt
!$ write(6,*) !$ write(6,*)
! sanity check ! sanity check