From 797073b0156bada767241885b556c61cc248b97c Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 17 Sep 2020 19:28:41 +0200 Subject: [PATCH] print choses output unit automatically, no need to rely on 6 also shorter... --- src/CPFEM.f90 | 29 +++++++------- src/CPFEM2.f90 | 2 +- src/DAMASK_marc.f90 | 46 +++++++++++----------- src/IO.f90 | 2 +- src/YAML_types.f90 | 2 +- src/base64.f90 | 2 +- src/constitutive_plastic_isotropic.f90 | 10 ++--- src/constitutive_plastic_kinehardening.f90 | 4 +- src/constitutive_plastic_nonlocal.f90 | 2 +- src/crystallite.f90 | 36 ++++++++--------- src/damage_local.f90 | 2 +- src/damage_none.f90 | 2 +- src/damage_nonlocal.f90 | 2 +- src/lattice.f90 | 2 +- src/material.f90 | 13 +++--- src/math.f90 | 8 ++-- src/prec.f90 | 14 +++---- src/thermal_adiabatic.f90 | 2 +- src/thermal_conduction.f90 | 2 +- src/thermal_isothermal.f90 | 2 +- 20 files changed, 90 insertions(+), 94 deletions(-) diff --git a/src/CPFEM.f90 b/src/CPFEM.f90 index 6c820b248..d0fc6413e 100644 --- a/src/CPFEM.f90 +++ b/src/CPFEM.f90 @@ -106,8 +106,7 @@ subroutine CPFEM_init num_commercialFEM, & debug_CPFEM - write(6,'(/,a)') ' <<<+- CPFEM init -+>>>' - flush(6) + print'(/,a)', ' <<<+- CPFEM init -+>>>'; flush(6) allocate(CPFEM_cs( 6,discretization_nIP,discretization_nElem), source= 0.0_pReal) allocate(CPFEM_dcsdE( 6,6,discretization_nIP,discretization_nElem), source= 0.0_pReal) @@ -130,9 +129,9 @@ subroutine CPFEM_init debugCPFEM%ip = config_debug%get_asInt('integrationpoint',defaultVal = 1) if(debugCPFEM%basic) then - write(6,'(a32,1x,6(i8,1x))') 'CPFEM_cs: ', shape(CPFEM_cs) - write(6,'(a32,1x,6(i8,1x))') 'CPFEM_dcsdE: ', shape(CPFEM_dcsdE) - write(6,'(a32,1x,6(i8,1x),/)') 'CPFEM_dcsdE_knownGood: ', shape(CPFEM_dcsdE_knownGood) + print'(a32,1x,6(i8,1x))', 'CPFEM_cs: ', shape(CPFEM_cs) + print'(a32,1x,6(i8,1x))', 'CPFEM_dcsdE: ', shape(CPFEM_dcsdE) + print'(a32,1x,6(i8,1x),/)', 'CPFEM_dcsdE_knownGood: ', shape(CPFEM_dcsdE_knownGood) flush(6) endif @@ -171,14 +170,14 @@ subroutine CPFEM_general(mode, ffn, ffn1, temperature_inp, dt, elFE, ip, cauchyS elCP = mesh_FEM2DAMASK_elem(elFE) if (debugCPFEM%basic .and. elCP == debugCPFEM%element .and. ip == debugCPFEM%ip) then - write(6,'(/,a)') '#############################################' - write(6,'(a1,a22,1x,i8,a13)') '#','element', elCP, '#' - write(6,'(a1,a22,1x,i8,a13)') '#','ip', ip, '#' - write(6,'(a1,a22,1x,i8,a13)') '#','cycleCounter', cycleCounter, '#' - write(6,'(a1,a22,1x,i8,a13)') '#','computationMode',mode, '#' + print'(/,a)', '#############################################' + print'(a1,a22,1x,i8,a13)', '#','element', elCP, '#' + print'(a1,a22,1x,i8,a13)', '#','ip', ip, '#' + print'(a1,a22,1x,i8,a13)', '#','cycleCounter', cycleCounter, '#' + print'(a1,a22,1x,i8,a13)', '#','computationMode',mode, '#' if (terminallyIll) & - write(6,'(a,/)') '# --- terminallyIll --- #' - write(6,'(a,/)') '#############################################'; flush (6) + print'(a,/)', '# --- terminallyIll --- #' + print'(a,/)', '#############################################'; flush (6) endif if (iand(mode, CPFEM_BACKUPJACOBIAN) /= 0_pInt) & @@ -209,7 +208,7 @@ subroutine CPFEM_general(mode, ffn, ffn1, temperature_inp, dt, elFE, ip, cauchyS FEsolving_execElem = elCP FEsolving_execIP = ip if (debugCPFEM%extensive) & - write(6,'(a,i8,1x,i2)') '<< CPFEM >> calculation for elFE ip ',elFE,ip + print'(a,i8,1x,i2)', '<< CPFEM >> calculation for elFE ip ',elFE,ip call materialpoint_stressAndItsTangent(updateJaco, dt) terminalIllness: if (terminallyIll) then @@ -247,9 +246,9 @@ subroutine CPFEM_general(mode, ffn, ffn1, temperature_inp, dt, elFE, ip, cauchyS if (debugCPFEM%extensive & .and. ((debugCPFEM%element == elCP .and. debugCPFEM%ip == ip) .or. .not. debugCPFEM%selective)) then - write(6,'(a,i8,1x,i2,/,12x,6(f10.3,1x)/)') & + print'(a,i8,1x,i2,/,12x,6(f10.3,1x)/)', & '<< CPFEM >> stress/MPa at elFE ip ', elFE, ip, CPFEM_cs(1:6,ip,elCP)*1.0e-6_pReal - write(6,'(a,i8,1x,i2,/,6(12x,6(f10.3,1x)/))') & + print'(a,i8,1x,i2,/,6(12x,6(f10.3,1x)/))', & '<< CPFEM >> Jacobian/GPa at elFE ip ', elFE, ip, transpose(CPFEM_dcsdE(1:6,1:6,ip,elCP))*1.0e-9_pReal flush(6) endif diff --git a/src/CPFEM2.f90 b/src/CPFEM2.f90 index ab70acbe8..c87f361c2 100644 --- a/src/CPFEM2.f90 +++ b/src/CPFEM2.f90 @@ -76,7 +76,7 @@ end subroutine CPFEM_initAll !-------------------------------------------------------------------------------------------------- subroutine CPFEM_init - write(6,'(/,a)') ' <<<+- CPFEM init -+>>>'; flush(6) + print'(/,a)', ' <<<+- CPFEM init -+>>>'; flush(6) if (interface_restartInc > 0) call crystallite_restartRead diff --git a/src/DAMASK_marc.f90 b/src/DAMASK_marc.f90 index e497c65a9..b6f9436ff 100644 --- a/src/DAMASK_marc.f90 +++ b/src/DAMASK_marc.f90 @@ -58,33 +58,33 @@ subroutine DAMASK_interface_init integer :: ierr character(len=pPathLen) :: wd - write(6,'(/,a)') ' <<<+- DAMASK_marc init -+>>>' + print'(/,a)', ' <<<+- DAMASK_marc init -+>>>' - write(6,'(/,a)') ' Roters et al., Computational Materials Science 158:420–478, 2019' - write(6,'(a)') ' https://doi.org/10.1016/j.commatsci.2018.04.030' + print*, 'Roters et al., Computational Materials Science 158:420–478, 2019' + print*, 'https://doi.org/10.1016/j.commatsci.2018.04.030' - write(6,'(/,a)') ' Version: '//DAMASKVERSION + print'(/,a)', ' Version: '//DAMASKVERSION ! https://github.com/jeffhammond/HPCInfo/blob/master/docs/Preprocessor-Macros.md #if __INTEL_COMPILER >= 1800 - write(6,'(/,a)') ' Compiled with: '//compiler_version() - write(6,'(a)') ' Compiler options: '//compiler_options() + print'(/,a)', ' Compiled with: '//compiler_version() + print'(a)', ' Compiler options: '//compiler_options() #else - write(6,'(/,a,i4.4,a,i8.8)') ' Compiled with Intel fortran version :', __INTEL_COMPILER,& + print'(/,a,i4.4,a,i8.8)', ' Compiled with Intel fortran version :', __INTEL_COMPILER,& ', build date :', __INTEL_COMPILER_BUILD_DATE #endif - write(6,'(/,a)') ' Compiled on: '//__DATE__//' at '//__TIME__ + print'(/,a)', ' Compiled on: '//__DATE__//' at '//__TIME__ call date_and_time(values = dateAndTime) - write(6,'(/,a,2(i2.2,a),i4.4)') ' Date: ',dateAndTime(3),'/',dateAndTime(2),'/', dateAndTime(1) - write(6,'(a,2(i2.2,a),i2.2)') ' Time: ',dateAndTime(5),':', dateAndTime(6),':', dateAndTime(7) + print'(/,a,2(i2.2,a),i4.4)', ' Date: ',dateAndTime(3),'/',dateAndTime(2),'/', dateAndTime(1) + print'(a,2(i2.2,a),i2.2)', ' Time: ',dateAndTime(5),':', dateAndTime(6),':', dateAndTime(7) inquire(5, name=wd) wd = wd(1:scan(wd,'/',back=.true.)) ierr = CHDIR(wd) if (ierr /= 0) then - write(6,'(a20,a,a16)') ' working directory "',trim(wd),'" does not exist' + print*, 'working directory "'//trim(wd)//'" does not exist' call quit(1) endif symmetricSolver = solverIsSymmetric() @@ -257,14 +257,14 @@ subroutine hypela2(d,g,e,de,s,t,dt,ngens,m,nn,kcus,matus,ndi,nshear,disp, & debug_Marc ! pointer to Marc debug options if(debug_basic) then - write(6,'(a,/,i8,i8,i2)') ' MSC.MARC information on shape of element(2), IP:', m, nn - write(6,'(a,2(i1))') ' Jacobian: ', ngens,ngens - write(6,'(a,i1)') ' Direct stress: ', ndi - write(6,'(a,i1)') ' Shear stress: ', nshear - write(6,'(a,i2)') ' DoF: ', ndeg - write(6,'(a,i2)') ' Coordinates: ', ncrd - write(6,'(a,i12)') ' Nodes: ', nnode - write(6,'(a,i1)') ' Deformation gradient: ', itel + print'(a,/,i8,i8,i2)', ' MSC.MARC information on shape of element(2), IP:', m, nn + print'(a,2(i1))', ' Jacobian: ', ngens,ngens + print'(a,i1)', ' Direct stress: ', ndi + print'(a,i1)', ' Shear stress: ', nshear + print'(a,i2)', ' DoF: ', ndeg + print'(a,i2)', ' Coordinates: ', ncrd + print'(a,i12)', ' Nodes: ', nnode + print'(a,i1)', ' Deformation gradient: ', itel write(6,'(/,a,/,3(3(f12.7,1x)/))',advance='no') ' Deformation gradient at t=n:', & transpose(ffn) write(6,'(/,a,/,3(3(f12.7,1x)/))',advance='no') ' Deformation gradient at t=n+1:', & @@ -295,22 +295,22 @@ subroutine hypela2(d,g,e,de,s,t,dt,ngens,m,nn,kcus,matus,ndi,nshear,disp, & lastIncConverged = .false. outdatedByNewInc = .false. lastLovl = lovl ! pretend that this is NOT the first after a lovl change - write(6,'(a,i6,1x,i2)') '<< HYPELA2 >> start of analysis..! ',m(1),nn + print'(a,i6,1x,i2)', '<< HYPELA2 >> start of analysis..! ',m(1),nn else if (inc - theInc > 1) then ! >> restart of broken analysis << lastIncConverged = .false. outdatedByNewInc = .false. - write(6,'(a,i6,1x,i2)') '<< HYPELA2 >> restart of analysis..! ',m(1),nn + print'(a,i6,1x,i2)', '<< HYPELA2 >> restart of analysis..! ',m(1),nn else ! >> just the next inc << lastIncConverged = .true. outdatedByNewInc = .true. - write(6,'(a,i6,1x,i2)') '<< HYPELA2 >> new increment..! ',m(1),nn + print'(a,i6,1x,i2)', '<< HYPELA2 >> new increment..! ',m(1),nn endif else if ( timinc < theDelta ) then ! >> cutBack << lastIncConverged = .false. outdatedByNewInc = .false. terminallyIll = .false. cycleCounter = -1 ! first calc step increments this to cycle = 0 - write(6,'(a,i6,1x,i2)') '<< HYPELA2 >> cutback detected..! ',m(1),nn + print'(a,i6,1x,i2)', '<< HYPELA2 >> cutback detected..! ',m(1),nn endif ! convergence treatment end flush(6) diff --git a/src/IO.f90 b/src/IO.f90 index 53781653e..6da7a10c8 100644 --- a/src/IO.f90 +++ b/src/IO.f90 @@ -47,7 +47,7 @@ contains !-------------------------------------------------------------------------------------------------- subroutine IO_init - write(6,'(/,a)') ' <<<+- IO init -+>>>'; flush(6) + print'(/,a)', ' <<<+- IO init -+>>>'; flush(6) call selfTest diff --git a/src/YAML_types.f90 b/src/YAML_types.f90 index 1752474ad..cc1c85efd 100644 --- a/src/YAML_types.f90 +++ b/src/YAML_types.f90 @@ -189,7 +189,7 @@ contains !-------------------------------------------------------------------------------------------------- subroutine YAML_types_init - write(6,'(/,a)') ' <<<+- YAML_types init -+>>>' + print'(/,a)', ' <<<+- YAML_types init -+>>>' call selfTest diff --git a/src/base64.f90 b/src/base64.f90 index a9cd4eacf..3a59b7049 100644 --- a/src/base64.f90 +++ b/src/base64.f90 @@ -27,7 +27,7 @@ contains !-------------------------------------------------------------------------------------------------- subroutine base64_init - write(6,'(/,a)') ' <<<+- base64 init -+>>>'; flush(6) + print'(/,a)', ' <<<+- base64 init -+>>>'; flush(6) call selfTest diff --git a/src/constitutive_plastic_isotropic.f90 b/src/constitutive_plastic_isotropic.f90 index 382b641b3..c78d497d6 100644 --- a/src/constitutive_plastic_isotropic.f90 +++ b/src/constitutive_plastic_isotropic.f90 @@ -201,10 +201,10 @@ module subroutine plastic_isotropic_LpAndItsTangent(Lp,dLp_dMp,Mp,instance,of) Lp = dot_gamma/prm%M * Mp_dev/norm_Mp_dev #ifdef DEBUG if (debugConstitutive%extensive .and. (of == prm%of_debug .or. .not. debugConstitutive%selective)) then - write(6,'(/,a,/,3(12x,3(f12.4,1x)/))') '<< CONST isotropic >> Tstar (dev) / MPa', & + print'(/,a,/,3(12x,3(f12.4,1x)/))', '<< CONST isotropic >> Tstar (dev) / MPa', & transpose(Mp_dev)*1.0e-6_pReal - write(6,'(/,a,/,f12.5)') '<< CONST isotropic >> norm Tstar / MPa', norm_Mp_dev*1.0e-6_pReal - write(6,'(/,a,/,f12.5)') '<< CONST isotropic >> gdot', dot_gamma + print'(/,a,/,f12.5)', '<< CONST isotropic >> norm Tstar / MPa', norm_Mp_dev*1.0e-6_pReal + print'(/,a,/,f12.5)', '<< CONST isotropic >> gdot', dot_gamma end if #endif forall (k=1:3,l=1:3,m=1:3,n=1:3) & @@ -256,8 +256,8 @@ module subroutine plastic_isotropic_LiAndItsTangent(Li,dLi_dMi,Mi,instance,of) #ifdef DEBUG if (debugConstitutive%extensive .and. (of == prm%of_debug .or. .not. debugConstitutive%selective)) then - write(6,'(/,a,/,f12.5)') '<< CONST isotropic >> pressure / MPa', tr/3.0_pReal*1.0e-6_pReal - write(6,'(/,a,/,f12.5)') '<< CONST isotropic >> gdot', prm%dot_gamma_0 * (3.0_pReal*prm%M*stt%xi(of))**(-prm%n) & + print'(/,a,/,f12.5)', '<< CONST isotropic >> pressure / MPa', tr/3.0_pReal*1.0e-6_pReal + print'(/,a,/,f12.5)', '<< CONST isotropic >> gdot', prm%dot_gamma_0 * (3.0_pReal*prm%M*stt%xi(of))**(-prm%n) & * tr * abs(tr)**(prm%n-1.0_pReal) end if #endif diff --git a/src/constitutive_plastic_kinehardening.f90 b/src/constitutive_plastic_kinehardening.f90 index d3ffd2c85..fe17b090e 100644 --- a/src/constitutive_plastic_kinehardening.f90 +++ b/src/constitutive_plastic_kinehardening.f90 @@ -345,8 +345,8 @@ module subroutine plastic_kinehardening_deltaState(Mp,instance,of) #ifdef DEBUG if (debugConstitutive%extensive & .and. (of == prm%of_debug .or. .not. debugConstitutive%selective)) then - write(6,'(a)') '======= kinehardening delta state =======' - write(6,*) sense,state(instance)%sense(:,of) + print*, '======= kinehardening delta state =======' + print*, sense,state(instance)%sense(:,of) endif #endif diff --git a/src/constitutive_plastic_nonlocal.f90 b/src/constitutive_plastic_nonlocal.f90 index 152cde43e..c96301691 100644 --- a/src/constitutive_plastic_nonlocal.f90 +++ b/src/constitutive_plastic_nonlocal.f90 @@ -1274,7 +1274,7 @@ function rhoDotFlux(F,Fp,timestep, instance,of,ip,el) .and. prm%CFLfactor * abs(v0) * timestep & > IPvolume(ip,el) / maxval(IParea(:,ip,el))), & ' at a timestep of ',timestep - write(6,'(a)') '<< CONST >> enforcing cutback !!!' + print*, '<< CONST >> enforcing cutback !!!' endif #endif rhoDotFlux = IEEE_value(1.0_pReal,IEEE_quiet_NaN) ! enforce cutback diff --git a/src/crystallite.f90 b/src/crystallite.f90 index def98bf23..bed36d79b 100644 --- a/src/crystallite.f90 +++ b/src/crystallite.f90 @@ -146,7 +146,7 @@ subroutine crystallite_init phase, & generic_param - write(6,'(/,a)') ' <<<+- crystallite init -+>>>' + print'(/,a)', ' <<<+- crystallite init -+>>>' debug_crystallite => config_debug%get('crystallite', defaultVal=emptyList) debugCrystallite%basic = debug_crystallite%contains('basic') @@ -291,9 +291,9 @@ subroutine crystallite_init #ifdef DEBUG if (debugCrystallite%basic) then - write(6,'(a42,1x,i10)') ' # of elements: ', eMax - write(6,'(a42,1x,i10)') ' # of integration points/element: ', iMax - write(6,'(a42,1x,i10)') 'max # of constituents/integration point: ', cMax + print'(a42,1x,i10)', ' # of elements: ', eMax + print'(a42,1x,i10)', ' # of integration points/element: ', iMax + print'(a42,1x,i10)', 'max # of constituents/integration point: ', cMax flush(6) endif @@ -324,24 +324,24 @@ function crystallite_stress() if (debugCrystallite%selective & .and. FEsolving_execElem(1) <= debugCrystallite%element & .and. debugCrystallite%element <= FEsolving_execElem(2)) then - write(6,'(/,a,i8,1x,i2,1x,i3)') '<< CRYST stress >> boundary and initial values at el ip ipc ', & + print'(/,a,i8,1x,i2,1x,i3)', '<< CRYST stress >> boundary and initial values at el ip ipc ', & debugCrystallite%element,debugCrystallite%ip, debugCrystallite%grain - write(6,'(a,/,3(12x,3(f14.9,1x)/))') '<< CRYST stress >> F ', & + print'(a,/,3(12x,3(f14.9,1x)/))', '<< CRYST stress >> F ', & transpose(crystallite_partionedF(1:3,1:3,debugCrystallite%grain, & debugCrystallite%ip,debugCrystallite%element)) - write(6,'(a,/,3(12x,3(f14.9,1x)/))') '<< CRYST stress >> F0 ', & + print'(a,/,3(12x,3(f14.9,1x)/))', '<< CRYST stress >> F0 ', & transpose(crystallite_partionedF0(1:3,1:3,debugCrystallite%grain, & debugCrystallite%ip,debugCrystallite%element)) - write(6,'(a,/,3(12x,3(f14.9,1x)/))') '<< CRYST stress >> Fp0', & + print'(a,/,3(12x,3(f14.9,1x)/))', '<< CRYST stress >> Fp0', & transpose(crystallite_partionedFp0(1:3,1:3,debugCrystallite%grain, & debugCrystallite%ip,debugCrystallite%element)) - write(6,'(a,/,3(12x,3(f14.9,1x)/))') '<< CRYST stress >> Fi0', & + print'(a,/,3(12x,3(f14.9,1x)/))', '<< CRYST stress >> Fi0', & transpose(crystallite_partionedFi0(1:3,1:3,debugCrystallite%grain, & debugCrystallite%ip,debugCrystallite%element)) - write(6,'(a,/,3(12x,3(f14.9,1x)/))') '<< CRYST stress >> Lp0', & + print'(a,/,3(12x,3(f14.9,1x)/))', '<< CRYST stress >> Lp0', & transpose(crystallite_partionedLp0(1:3,1:3,debugCrystallite%grain, & debugCrystallite%ip,debugCrystallite%element)) - write(6,'(a,/,3(12x,3(f14.9,1x)/))') '<< CRYST stress >> Li0', & + print'(a,/,3(12x,3(f14.9,1x)/))', '<< CRYST stress >> Li0', & transpose(crystallite_partionedLi0(1:3,1:3,debugCrystallite%grain, & debugCrystallite%ip,debugCrystallite%element)) endif @@ -390,7 +390,7 @@ function crystallite_stress() #ifdef DEBUG if (debugCrystallite%extensive) & - write(6,'(a,i6)') '<< CRYST stress >> crystallite iteration ',NiterationCrystallite + print'(a,i6)', '<< CRYST stress >> crystallite iteration ',NiterationCrystallite #endif !$OMP PARALLEL DO PRIVATE(formerSubStep) elementLooping3: do e = FEsolving_execElem(1),FEsolving_execElem(2) @@ -1561,9 +1561,9 @@ subroutine crystallite_restartWrite integer(HID_T) :: fileHandle, groupHandle character(len=pStringLen) :: fileName, datasetName - write(6,'(a)') ' writing field and constitutive data required for restart to file';flush(6) + print'(a)', ' writing field and constitutive data required for restart to file';flush(6) - write(fileName,'(a,i0,a)') trim(getSolverJobName())//'_',worldrank,'.hdf5' + write(fileName,'(a,i0,a)', trim(getSolverJobName())//'_',worldrank,'.hdf5' fileHandle = HDF5_openFile(fileName,'a') call HDF5_write(fileHandle,crystallite_partionedF,'F') @@ -1575,14 +1575,14 @@ subroutine crystallite_restartWrite groupHandle = HDF5_addGroup(fileHandle,'constituent') do i = 1,size(material_name_phase) - write(datasetName,'(i0,a)') i,'_omega_plastic' + write(datasetName,'(i0,a)', i,'_omega_plastic' call HDF5_write(groupHandle,plasticState(i)%state,datasetName) enddo call HDF5_closeGroup(groupHandle) groupHandle = HDF5_addGroup(fileHandle,'materialpoint') do i = 1, material_Nhomogenization - write(datasetName,'(i0,a)') i,'_omega_homogenization' + write(datasetName,'(i0,a)', i,'_omega_homogenization' call HDF5_write(groupHandle,homogState(i)%state,datasetName) enddo call HDF5_closeGroup(groupHandle) @@ -1602,9 +1602,9 @@ subroutine crystallite_restartRead integer(HID_T) :: fileHandle, groupHandle character(len=pStringLen) :: fileName, datasetName - write(6,'(/,a,i0,a)') ' reading restart information of increment from file' + print'(/,a,i0,a)', ' reading restart information of increment from file' - write(fileName,'(a,i0,a)') trim(getSolverJobName())//'_',worldrank,'.hdf5' + write(fileName,'(a,i0,a)', trim(getSolverJobName())//'_',worldrank,'.hdf5' fileHandle = HDF5_openFile(fileName) call HDF5_read(fileHandle,crystallite_F0, 'F') diff --git a/src/damage_local.f90 b/src/damage_local.f90 index f55dcf52e..3588010b2 100644 --- a/src/damage_local.f90 +++ b/src/damage_local.f90 @@ -49,7 +49,7 @@ subroutine damage_local_init homog, & homogDamage - write(6,'(/,a)') ' <<<+- damage_local init -+>>>'; flush(6) + print'(/,a)', ' <<<+- damage_local init -+>>>'; flush(6) !---------------------------------------------------------------------------------------------- ! read numerics parameter and do sanity check diff --git a/src/damage_none.f90 b/src/damage_none.f90 index 00e3e132d..4e01998bc 100644 --- a/src/damage_none.f90 +++ b/src/damage_none.f90 @@ -18,7 +18,7 @@ subroutine damage_none_init integer :: h,NofMyHomog - write(6,'(/,a)') ' <<<+- damage_none init -+>>>'; flush(6) + print'(/,a)', ' <<<+- damage_none init -+>>>'; flush(6) do h = 1, material_Nhomogenization if (damage_type(h) /= DAMAGE_NONE_ID) cycle diff --git a/src/damage_nonlocal.f90 b/src/damage_nonlocal.f90 index b9b800555..a4ea54493 100644 --- a/src/damage_nonlocal.f90 +++ b/src/damage_nonlocal.f90 @@ -53,7 +53,7 @@ subroutine damage_nonlocal_init homog, & homogDamage - write(6,'(/,a)') ' <<<+- damage_nonlocal init -+>>>'; flush(6) + print'(/,a)', ' <<<+- damage_nonlocal init -+>>>'; flush(6) !------------------------------------------------------------------------------------ ! read numerics parameter diff --git a/src/lattice.f90 b/src/lattice.f90 index 8b8e0f686..d0ac07ed6 100644 --- a/src/lattice.f90 +++ b/src/lattice.f90 @@ -457,7 +457,7 @@ subroutine lattice_init phase, & elasticity - write(6,'(/,a)') ' <<<+- lattice init -+>>>'; flush(6) + print'(/,a)', ' <<<+- lattice init -+>>>'; flush(6) phases => config_material%get('phase') Nphases = phases%length diff --git a/src/material.f90 b/src/material.f90 index 3d8f3fc31..835de2fc1 100644 --- a/src/material.f90 +++ b/src/material.f90 @@ -160,12 +160,11 @@ subroutine material_init(restart) integer :: ph, myHomog class(tNode), pointer :: & - debug_material, & ! pointer to material debug options phases, & material_homogenization character(len=pStringLen) :: sectionName - write(6,'(/,a)') ' <<<+- material init -+>>>'; flush(6) + print'(/,a)', ' <<<+- material init -+>>>'; flush(6) phases => config_material%get('phase') allocate(material_name_phase(phases%length)) @@ -181,13 +180,11 @@ subroutine material_init(restart) material_name_homogenization(myHomog) = trim(adjustl(sectionName))//material_homogenization%getKey(myHomog) enddo - debug_material => config_debug%get('material',defaultVal=emptyList) + call material_parseMicrostructure + print*, ' Microstructure parsed' - call material_parseMicrostructure() - if (debug_material%contains('basic')) write(6,'(a)') ' Microstructure parsed'; flush(6) - - call material_parseHomogenization() - if (debug_material%contains('basic')) write(6,'(a)') ' Homogenization parsed'; flush(6) + call material_parseHomogenization + print*, ' Homogenization parsed' if(homogenization_maxNgrains > size(material_phaseAt,1)) call IO_error(148) diff --git a/src/math.f90 b/src/math.f90 index 5b0e2b987..b835a35b2 100644 --- a/src/math.f90 +++ b/src/math.f90 @@ -91,7 +91,7 @@ subroutine math_init class(tNode), pointer :: & num_generic - write(6,'(/,a)') ' <<<+- math init -+>>>'; flush(6) + print'(/,a)', ' <<<+- math init -+>>>'; flush(6) num_generic => config_numerics%get('generic',defaultVal=emptyDict) randomSeed = num_generic%get_asInt('random_seed', defaultVal = 0) @@ -109,9 +109,9 @@ subroutine math_init call random_seed(put = randInit) call random_number(randTest) - write(6,'(a,i2)') ' size of random seed: ', randSize - write(6,'(a,i0)') ' value of random seed: ', randInit(1) - write(6,'(a,4(/,26x,f17.14),/)') ' start of random sequence: ', randTest + print'(a,i2)', ' size of random seed: ', randSize + print'(a,i0)', ' value of random seed: ', randInit(1) + print'(a,4(/,26x,f17.14),/)', ' start of random sequence: ', randTest call random_seed(put = randInit) diff --git a/src/prec.f90 b/src/prec.f90 index 87c2f6848..c8700089b 100644 --- a/src/prec.f90 +++ b/src/prec.f90 @@ -87,14 +87,14 @@ contains !-------------------------------------------------------------------------------------------------- subroutine prec_init - write(6,'(/,a)') ' <<<+- prec init -+>>>' + print'(/,a)', ' <<<+- prec init -+>>>' - write(6,'(a,i3)') ' Size of integer in bit: ',bit_size(0) - write(6,'(a,i19)') ' Maximum value: ',huge(0) - write(6,'(/,a,i3)') ' Size of float in bit: ',storage_size(0.0_pReal) - write(6,'(a,e10.3)') ' Maximum value: ',huge(0.0_pReal) - write(6,'(a,e10.3)') ' Minimum value: ',tiny(0.0_pReal) - write(6,'(a,i3)') ' Decimal precision: ',precision(0.0_pReal) + print'(a,i3)', ' Size of integer in bit: ',bit_size(0) + print'(a,i19)', ' Maximum value: ',huge(0) + print'(/,a,i3)', ' Size of float in bit: ',storage_size(0.0_pReal) + print'(a,e10.3)', ' Maximum value: ',huge(0.0_pReal) + print'(a,e10.3)', ' Minimum value: ',tiny(0.0_pReal) + print'(a,i3)', ' Decimal precision: ',precision(0.0_pReal) call selfTest diff --git a/src/thermal_adiabatic.f90 b/src/thermal_adiabatic.f90 index f6291a25b..1601a9b4f 100644 --- a/src/thermal_adiabatic.f90 +++ b/src/thermal_adiabatic.f90 @@ -46,7 +46,7 @@ subroutine thermal_adiabatic_init homog, & homogThermal - write(6,'(/,a)') ' <<<+- thermal_adiabatic init -+>>>'; flush(6) + print'(/,a)', ' <<<+- thermal_adiabatic init -+>>>'; flush(6) maxNinstance = count(thermal_type == THERMAL_adiabatic_ID) if (maxNinstance == 0) return diff --git a/src/thermal_conduction.f90 b/src/thermal_conduction.f90 index b14fe4a22..5556a54e1 100644 --- a/src/thermal_conduction.f90 +++ b/src/thermal_conduction.f90 @@ -47,7 +47,7 @@ subroutine thermal_conduction_init homog, & homogThermal - write(6,'(/,a)') ' <<<+- thermal_conduction init -+>>>'; flush(6) + print'(/,a)', ' <<<+- thermal_conduction init -+>>>'; flush(6) Ninstance = count(thermal_type == THERMAL_conduction_ID) allocate(param(Ninstance)) diff --git a/src/thermal_isothermal.f90 b/src/thermal_isothermal.f90 index 38aa99136..2dda358ac 100644 --- a/src/thermal_isothermal.f90 +++ b/src/thermal_isothermal.f90 @@ -18,7 +18,7 @@ subroutine thermal_isothermal_init integer :: h,NofMyHomog - write(6,'(/,a)') ' <<<+- thermal_isothermal init -+>>>'; flush(6) + print'(/,a)', ' <<<+- thermal_isothermal init -+>>>'; flush(6) do h = 1, material_Nhomogenization if (thermal_type(h) /= THERMAL_isothermal_ID) cycle