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

MODFLOW-USGS · Jan 25, 2025 · 6def777 · 6def777
1 parent ccfe0e9
commit 6def777
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 19 deletions.
diff --git a/doc/mf6io/gwf/tsi.tex b/doc/mf6io/gwf/tsi.tex
@@ -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

diff --git a/doc/mf6io/mf6ivar/examples/olf-dis2d-example.dat b/doc/mf6io/mf6ivar/examples/olf-dis2d-example.dat
@@ -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
-
diff --git a/doc/mf6io/mf6ivar/examples/utl-spca-example.dat b/doc/mf6io/mf6ivar/examples/utl-spca-example.dat
@@ -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

diff --git a/utils/mf5to6/src/EvtPackageWriter.f90 b/utils/mf5to6/src/EvtPackageWriter.f90
@@ -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
@@ -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)
@@ -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)

diff --git a/utils/mf5to6/src/NpfWriter.f90 b/utils/mf5to6/src/NpfWriter.f90
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/utils/mf5to6/src/PackageWriter.f90 b/utils/mf5to6/src/PackageWriter.f90
@@ -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)

diff --git a/utils/mf5to6/src/Preproc/Utilities.f90 b/utils/mf5to6/src/Preproc/Utilities.f90
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/utils/mf5to6/src/RchPackageWriter.f90 b/utils/mf5to6/src/RchPackageWriter.f90
@@ -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
@@ -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)