diff --git a/src/grid_mech_spectral_polarisation.f90 b/src/grid_mech_spectral_polarisation.f90 index e87b8ec46..1f64be0a0 100644 --- a/src/grid_mech_spectral_polarisation.f90 +++ b/src/grid_mech_spectral_polarisation.f90 @@ -232,16 +232,16 @@ subroutine grid_mech_spectral_polarisation_init restartRead: if (restartInc > 0) then write(6,'(/,a,'//IO_intOut(restartInc)//',a)') ' reading more values of increment ', restartInc, ' from file' - call HDF5_read(fileHandle,C_volAvg, 'C_volAvg') - call HDF5_read(fileHandle,C_volAvgLastInc,'C_volAvgLastInc') - call HDF5_read(fileHandle,C_minMaxAvg,'C_ref') - call HDF5_closeFile(fileHandle) - ! fileUnit = IO_open_jobFile_binary('C_volAvg') - ! read(fileUnit) C_volAvg; close(fileUnit) - ! fileUnit = IO_open_jobFile_binary('C_volAvgLastInv') - ! read(fileUnit) C_volAvgLastInc; close(fileUnit) - ! fileUnit = IO_open_jobFile_binary('C_ref') - ! read(fileUnit) C_minMaxAvg; close(fileUnit) + ! call HDF5_read(fileHandle,C_volAvg, 'C_volAvg') + ! call HDF5_read(fileHandle,C_volAvgLastInc,'C_volAvgLastInc') + ! call HDF5_read(fileHandle,C_minMaxAvg,'C_ref') + ! call HDF5_closeFile(fileHandle) + fileUnit = IO_open_jobFile_binary('C_volAvg') + read(fileUnit) C_volAvg; close(fileUnit) + fileUnit = IO_open_jobFile_binary('C_volAvgLastInv') + read(fileUnit) C_volAvgLastInc; close(fileUnit) + fileUnit = IO_open_jobFile_binary('C_ref') + read(fileUnit) C_minMaxAvg; close(fileUnit) endif restartRead call Utilities_updateGamma(C_minMaxAvg,.true.) @@ -384,41 +384,41 @@ subroutine grid_mech_spectral_polarisation_forward(guess,timeinc,timeinc_old,loa write(rankStr,'(a1,i0)')'_',worldrank fileHandle = HDF5_openFile(trim(getSolverJobName())//trim(rankStr)//'.hdf5','w') - + if (worldrank == 0) then - call HDF5_write(fileHandle,C_volAvg, 'C_volAvg') - call HDF5_write(fileHandle,C_volAvgLastInc,'C_volAvgLastInc') + ! call HDF5_write(fileHandle,C_volAvg, 'C_volAvg') + ! call HDF5_write(fileHandle,C_volAvgLastInc,'C_volAvgLastInc') call HDF5_write(fileHandle,F_aim, 'F_aim') call HDF5_write(fileHandle,F_aimDot, 'F_aimDot') - call HDF5_write(fileHandle,F_lastInc, 'F_lastInc') - ! fileUnit = IO_open_jobFile_binary('C_volAvg','w') - ! write(fileUnit) C_volAvg; close(fileUnit) - ! fileUnit = IO_open_jobFile_binary('C_volAvgLastInv','w') - ! write(fileUnit) C_volAvgLastInc; close(fileUnit) - ! fileUnit = IO_open_jobFile_binary('F_aim','w') - ! write(fileUnit) F_aim; close(fileUnit) - ! fileUnit = IO_open_jobFile_binary('F_aim_lastInc','w') - ! write(fileUnit) F_aim_lastInc; close(fileUnit) - ! fileUnit = IO_open_jobFile_binary('F_aimDot','w') - call HDF5_closeFile(fileHandle) - !write(fileUnit) F_aimDot; close(fileUnit) + call HDF5_write(fileHandle,F_aim_lastInc, 'F_aim_lastInc') + fileUnit = IO_open_jobFile_binary('C_volAvg','w') + write(fileUnit) C_volAvg; close(fileUnit) + fileUnit = IO_open_jobFile_binary('C_volAvgLastInv','w') + write(fileUnit) C_volAvgLastInc; close(fileUnit) + ! fileUnit = IO_open_jobFile_binary('F_aim','w') + ! write(fileUnit) F_aim; close(fileUnit) + ! fileUnit = IO_open_jobFile_binary('F_aim_lastInc','w') + ! write(fileUnit) F_aim_lastInc; close(fileUnit) + ! fileUnit = IO_open_jobFile_binary('F_aimDot','w') + ! call HDF5_closeFile(fileHandle) + ! write(fileUnit) F_aimDot; close(fileUnit) endif - !write(rankStr,'(a1,i0)')'_',worldrank + write(rankStr,'(a1,i0)')'_',worldrank call HDF5_write(fileHandle,F, 'F') call HDF5_write(fileHandle,F_lastInc, 'F_lastInc') call HDF5_write(fileHandle,F_tau, 'F_tau') call HDF5_write(fileHandle,F_tau_lastInc, 'F_tau_lastInc') call HDF5_closeFile(fileHandle) -! fileUnit = IO_open_jobFile_binary('F'//trim(rankStr),'w') -! write(fileUnit) F; close (fileUnit) -! fileUnit = IO_open_jobFile_binary('F_lastInc'//trim(rankStr),'w') -! write(fileUnit) F_lastInc; close (fileUnit) -! fileUnit = IO_open_jobFile_binary('F_tau'//trim(rankStr),'w') -! write(fileUnit) F_tau; close (fileUnit) -! fileUnit = IO_open_jobFile_binary('F_tau_lastInc'//trim(rankStr),'w') -! write(fileUnit) F_tau_lastInc; close (fileUnit) + !fileUnit = IO_open_jobFile_binary('F'//trim(rankStr),'w') + !write(fileUnit) F; close (fileUnit) + !fileUnit = IO_open_jobFile_binary('F_lastInc'//trim(rankStr),'w') + !write(fileUnit) F_lastInc; close (fileUnit) + !fileUnit = IO_open_jobFile_binary('F_tau'//trim(rankStr),'w') + !write(fileUnit) F_tau; close (fileUnit) + !fileUnit = IO_open_jobFile_binary('F_tau_lastInc'//trim(rankStr),'w') + !write(fileUnit) F_tau_lastInc; close (fileUnit) endif call CPFEM_age ! age state and kinematics