Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(mf5to6,docs): fix doubled whitespace in 'internal factor' #2164

Closed
wants to merge 1 commit into from
+18 −19
Closed

fix(mf5to6,docs): fix doubled whitespace in 'internal factor' #2164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/mf6io/gwf/tsi.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ \subsubsection{Using Time-Array Series in a Package}
CONSTANT 1
RECHARGE TIMEARRAYSERIES RchArraySeries_1
RchMult
INTERNAL FACTOR 1.0
INTERNAL FACTOR 1.0
0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
0.0 1.0 1.0 0.5 0.5 0.0 0.0 0.0 0.0 0.0
0.0 1.0 1.0 1.0 1.0 0.5 0.0 0.0 0.0 0.0
Expand Down
3 changes: 1 addition & 2 deletions doc/mf6io/mf6ivar/examples/olf-dis2d-example.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ BEGIN griddata
delc
CONSTANT 500.0
botm
INTERNAL FACTOR 1.0
INTERNAL FACTOR 1.0
1.05 0.95 0.85
1.05 0.95 0.85
1.05 0.95 0.85
END griddata

2 changes: 1 addition & 1 deletion doc/mf6io/mf6ivar/examples/utl-spca-example.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ END options

BEGIN PERIOD 1
CONCENTRATION
INTERNAL FACTOR 1.0
INTERNAL FACTOR 1.0
0.00000000 1.00000000 2.00000000 3.00000000 4.00000000
5.00000000 6.00000000 7.00000000 8.00000000 9.00000000
10.00000000 11.00000000 12.00000000 13.00000000 14.00000000
Expand Down
6 changes: 3 additions & 3 deletions utils/mf5to6/src/EvtPackageWriter.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ subroutine ProcessStressLoop(this, igrid)
if (constant) then
write(iu,50)'CONSTANT', nlval
else
write(iu,50)'INTERNAL FACTOR 1 IPRN ',iprni
write(iu,50)'INTERNAL FACTOR 1 IPRN ',iprni
do i=1,nrow
write(iu,80)(this%iet(j,i),j=1,ncol)
enddo
Expand Down Expand Up @@ -517,7 +517,7 @@ subroutine WriteSegArrayDataIfNeeded(this, iu, kper, currentBlock, &
write(iu,60)'CONSTANT', rvalpx
else
! write array control line and array to input file
write(iu,70)'INTERNAL FACTOR 1.0 IPRN ',iprnr
write(iu,70)'INTERNAL FACTOR 1.0 IPRN ',iprnr
do i=ii,n
call currentBlock%GetLine(i, line)
write(iu,10)trim(line)
Expand All @@ -533,7 +533,7 @@ subroutine WriteSegArrayDataIfNeeded(this, iu, kper, currentBlock, &
write(iu,60)'CONSTANT', rvalpe
else
! write array control line and array to input file
write(iu,70)'INTERNAL FACTOR 1.0 IPRN ',iprnr
write(iu,70)'INTERNAL FACTOR 1.0 IPRN ',iprnr
do i=ii,n
call currentBlock%GetLine(i, line)
write(iu,10)trim(line)
Expand Down
8 changes: 4 additions & 4 deletions utils/mf5to6/src/NpfWriter.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ subroutine WriteFile(this)
if (constant) then
write(iu,40)'CONSTANT', val0
else
write(iu,30)'INTERNAL FACTOR 1.0 IPRN ',iprnr
write(iu,30)'INTERNAL FACTOR 1.0 IPRN ',iprnr
call Write2dValues(iu,NROW,NCOL,this%hk(:,:,k))
endif
if (LAYCBD(k) /= 0) then
Expand Down Expand Up @@ -252,7 +252,7 @@ subroutine WriteFile(this)
if (constant) then
write(iu,40)'CONSTANT', val0
else
write(iu,30)'INTERNAL FACTOR 1.0 IPRN ',iprnr
write(iu,30)'INTERNAL FACTOR 1.0 IPRN ',iprnr
call Write2dValues(iu,NROW,NCOL,this%vk(:,:,k))
endif
enddo
Expand Down Expand Up @@ -302,7 +302,7 @@ subroutine WriteFile(this)
if (constant) then
write(iu,40)'CONSTANT', val0
else
write(iu,30)'INTERNAL FACTOR 1.0 IPRN ',iprnr
write(iu,30)'INTERNAL FACTOR 1.0 IPRN ',iprnr
call Write2dValues(iu,NROW,NCOL,this%WetDry(:,:,k))
endif
else
Expand Down Expand Up @@ -343,7 +343,7 @@ subroutine WriteFile(this)
this%hani(j,i,k) = this%hani(j,i,k) * this%hk(j,i,k)
end do
end do
write(iu,30)'INTERNAL FACTOR 1.0 IPRN ',iprnr
write(iu,30)'INTERNAL FACTOR 1.0 IPRN ',iprnr
call Write2dValues(iu,NROW,NCOL,this%hani(:,:,k))
endif
if (LAYCBD(k) /= 0) then
Expand Down
2 changes: 1 addition & 1 deletion utils/mf5to6/src/PackageWriter.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ subroutine WriteArrayDataIfNeeded(this, iu, kper, array, currentBlock, previousB
write(iu,60)'CONSTANT', rval
else
! write array control line and array to input file
write(iu,80)'INTERNAL FACTOR 1.0 IPRN ',iprnr
write(iu,80)'INTERNAL FACTOR 1.0 IPRN ',iprnr
n = currentBlock%CountLines()
do i=1,n
call currentBlock%GetLine(i, line)
Expand Down
10 changes: 5 additions & 5 deletions utils/mf5to6/src/Preproc/Utilities.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ subroutine Write1Drel(mout, n, array, constant, constantval, name, &
! formats
10 format(2x,a)
20 format(4x,'CONSTANT',2x,g16.9,4x,a)
30 format(4x,'INTERNAL FACTOR',2x,g16.9,2x,'IPRN',2x,i0,4x,a)
30 format(4x,'INTERNAL FACTOR',2x,g16.9,2x,'IPRN',2x,i0,4x,a)
!
! write name if requested, indented 2 spaces
if (writenameline) then
Expand Down Expand Up @@ -269,7 +269,7 @@ subroutine Write2Drel(mout, nrow, ncol, array, constant, constantval, name, &
! formats
10 format(2x,a)
20 format(4x,'CONSTANT',2x,g14.7)
30 format(4x,'INTERNAL FACTOR',2x,g14.7,2x,'IPRN',2x,i0)
30 format(4x,'INTERNAL FACTOR',2x,g14.7,2x,'IPRN',2x,i0)
!
! write name if requested, indented 2 spaces
if (writenameline) then
Expand Down Expand Up @@ -309,7 +309,7 @@ subroutine Write3Drel(mout, nrow, ncol, nlay, array, constant, &
! formats
10 format(2x,a)
20 format(4x,'CONSTANT',2x,g16.9,4x,a)
30 format(4x,'INTERNAL FACTOR',2x,g16.9,2x,'IPRN',2x,i0,4x,a)
30 format(4x,'INTERNAL FACTOR',2x,g16.9,2x,'IPRN',2x,i0,4x,a)
!
! write name if requested, indented 2 spaces
if (writenameline) then
Expand Down Expand Up @@ -501,7 +501,7 @@ subroutine Write2Dint(mout, nrow, ncol, array, constant, constantval, name, &
! formats
10 format(2x,a)
20 format(4x,'CONSTANT',2x,i0,2x,a)
30 format(4x,'INTERNAL FACTOR',2x,i0,2x,'IPRN',2x,i0,4x,a)
30 format(4x,'INTERNAL FACTOR',2x,i0,2x,'IPRN',2x,i0,4x,a)
40 format(20(1x,i4))
!
! write name if requested, indented 2 spaces
Expand Down Expand Up @@ -544,7 +544,7 @@ subroutine Write3Dint(mout, nrow, ncol, nlay, array, constant, constantval, name
! formats
10 format(2x,a)
20 format(4x,'CONSTANT',2x,i0,2x,a)
30 format(4x,'INTERNAL FACTOR',2x,i0,2x,'IPRN',2x,i0,4x,a)
30 format(4x,'INTERNAL FACTOR',2x,i0,2x,'IPRN',2x,i0,4x,a)
40 format(20(1x,i4))
!
! write name if requested, indented 2 spaces
Expand Down
4 changes: 2 additions & 2 deletions utils/mf5to6/src/RchPackageWriter.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ subroutine ProcessStressLoop(this, igrid)
if (constant) then
write(iu,50)'CONSTANT', nlval
else
write(iu,50)'INTERNAL FACTOR 1 IPRN ',iprni
write(iu,50)'INTERNAL FACTOR 1 IPRN ',iprni
do i=1,nrow
write(iu,80)(IRCH(j,i),j=1,ncol)
enddo
Expand Down Expand Up @@ -187,7 +187,7 @@ subroutine ProcessStressLoop(this, igrid)
write(iu,60)'CONSTANT', rechval
else
! write array control line and RECH array to input file
write(iu,50)'INTERNAL FACTOR 1.0 IPRN ',iprnr
write(iu,50)'INTERNAL FACTOR 1.0 IPRN ',iprnr
n = this%CurrentBlock%CountLines()
do i=1,n
call this%CurrentBlock%GetLine(i, line)
Expand Down
Loading