Skip to content
Snippets Groups Projects
Commit e46dfd10 authored by Dave Whipp's avatar Dave Whipp
Browse files

Fixed I/O typo

parent ba8787f3
No related branches found
No related tags found
No related merge requests found
...@@ -92,7 +92,7 @@ integer,dimension(:),allocatable::invoid,elvoid,rtf,ftr ...@@ -92,7 +92,7 @@ integer,dimension(:),allocatable::invoid,elvoid,rtf,ftr
integer myicon(100),nstep,ndir,iter,ii,lsf,levmax integer myicon(100),nstep,ndir,iter,ii,lsf,levmax
integer vermajor,verminor,verstat,verrev integer vermajor,verminor,verstat,verrev
integer input_vermajor,input_verminor integer input_vermajor,input_verminor
integer output_vermajor,output_verminor integer output_vermajor,output_verminor,output_verstat,output_verrev
logical,dimension(:),allocatable::influid,do_it,subset_leaves,instrain logical,dimension(:),allocatable::influid,do_it,subset_leaves,instrain
logical :: nest logical :: nest
...@@ -146,7 +146,7 @@ write (*,'(a)') '! 888 888 888 888 888 888 d88P 888 888 T ...@@ -146,7 +146,7 @@ write (*,'(a)') '! 888 888 888 888 888 888 d88P 888 888 T
write (*,'(a)') '! 888 .d88P Y88b. .d88P Y88b. .d88P d8888888888 888 T88b |' write (*,'(a)') '! 888 .d88P Y88b. .d88P Y88b. .d88P d8888888888 888 T88b |'
write (*,'(a)') '! 8888888P" "Y88888P" "Y88888P" d88P 888 888 T88b |' write (*,'(a)') '! 8888888P" "Y88888P" "Y88888P" d88P 888 888 T88b |'
write (*,'(a)') '! |' write (*,'(a)') '! |'
write (*,'(a,i1,a,i1,a,i1,a,i1,a)') '! DOUAR-WSMP post-processor ',vermajor,'.',verminor,'.',verstat,'.',verrev,' |' write (*,'(a,i1,a,i1,a,i1,a,i1,a)') '! DOUAR-WSMP post-processor version ',vermajor,'.',verminor,'.',verstat,'.',verrev,' |'
write (*,'(a)') '!------------------------------------------------------------------------------|' write (*,'(a)') '!------------------------------------------------------------------------------|'
write (*,'(a)') '!------------------------------------------------------------------------------|' write (*,'(a)') '!------------------------------------------------------------------------------|'
write (*,*) '' write (*,*) ''
...@@ -297,15 +297,17 @@ write(*,'(a)') '---------------------------------------------------------------- ...@@ -297,15 +297,17 @@ write(*,'(a)') '----------------------------------------------------------------
!==============================================================================! !==============================================================================!
!==============================================================================! !==============================================================================!
read(7,*) output_vermajor read(7) output_vermajor,output_verminor,output_verstat,output_verrev
read(7,*) output_verminor
if (vermajor/=output_vermajor .or. verminor/=output_verminor) then if (vermajor/=output_vermajor .or. verminor/=output_verminor) then
write (*,'(a)') 'Error: Post-processor version and DOUAR version do not agree.' write (*,'(a)') 'Error: Post-processor version and DOUAR version do not agree.'
write (*,'(a,i1,a,i1)') 'Post-processor version: ',vermajor,'.',verminor write (*,'(a,i1,a,i1)') 'Post-processor version: ',vermajor,'.',verminor
write (*,'(a,i1,a,i1)') 'DOUAR version: ',output_vermajor,'.',output_verminor write (*,'(a,i1,a,i1)') 'DOUAR version: ',output_vermajor,'.',output_verminor
write (*,'(a)') 'Unable to continue. Exiting.' write (*,'(a)') 'Unable to continue. Exiting.'
stop stop
else
write (*,'(a,i1,a,i1,a,i1,a,i1)') 'Reading output from DOUAR-WSMP v',output_vermajor,'.',output_verminor,'.',output_verstat,'.',output_verrev
endif endif
write(*,'(a)') '--------------------------------------------------------------------------'
read (7) ov%noctree,ov%nnode,ov%nleaves,ner,ov%nlsf,npcl,current_time read (7) ov%noctree,ov%nnode,ov%nleaves,ner,ov%nlsf,npcl,current_time
nn=ov%nnode nn=ov%nnode
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment