fix(mf5to6): fix converter for multiple mnw2 wells (#256)

* converter had multiple bugs for multiple MNW2 wells that spanned multiple model layers * closes #185 * added history to converter document
MODFLOW-USGS · Nov 12, 2019 · c03c76c · c03c76c
1 parent 585940b
commit c03c76c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/doc/ConverterGuide/converter_mf5to6.tex b/doc/ConverterGuide/converter_mf5to6.tex
@@ -286,6 +286,19 @@
 \normalsize
 \end{table}
 
+
+% -------------------------------------------------
+\section{History}
+This section describes changes introduced into the MODFLOW 6 converter with each official release.  These changes may substantially affect users.
+
+\begin{itemize}
+\item
+\currentmodflowversion
+\begin{itemize}
+  \item Fixed an issue in the conversion of MNW2 wells into the MODFLOW 6 format.  The converter did not produce correct results when multiple MNW wells were present and when the wells spanned multiple model layers.
+\end{itemize}
+\end{itemize}
+
 \REFSECTION
 %\SECTION{References Cited}
 \bibliography{../MODFLOW6References}

diff --git a/src/Model/GroundWaterFlow/gwf3disu8.f90 b/src/Model/GroundWaterFlow/gwf3disu8.f90
@@ -197,7 +197,7 @@ subroutine disu_init_mem(dis, name_model, iout, nodes, nja,                    &
       end do
     end if
     !
-    ! -- finialize connection data
+    ! -- finalize connection data
     call disext%con%con_finalize(iout, ihc, cl12, hwva, atemp)
     disext%njas = disext%con%njas
     !

diff --git a/src/Model/ModelUtilities/Connections.f90 b/src/Model/ModelUtilities/Connections.f90
@@ -276,7 +276,11 @@ subroutine read_from_block(this, name_model, nodes, nja, inunit, iout)
     !
     ! -- verify all items were read
     do n = 1, nname
+      !
+      ! -- skip angledegx because it is not required
       if(aname(n) == aname(6)) cycle
+      !
+      ! -- error if not read
       if(.not. lname(n)) then
         write(ermsg,'(1x,a,a)') &
           'ERROR.  REQUIRED CONNECTIONDATA INPUT WAS NOT SPECIFIED: ', &

diff --git a/utils/mf5to6/src/MawPackageWriter.f90 b/utils/mf5to6/src/MawPackageWriter.f90
@@ -481,8 +481,8 @@ subroutine WriteWellConnections(this)
       else
         ! Intervals are specified in MNW2 input
         ! Get first and last interval for this well
-        firstint = nint(mnwnod(12, iw))
-        lastint = nint(mnwnod(13, iw))
+        firstint = nint(mnwnod(12, firstnode))
+        lastint = nint(mnwnod(13, lastnode))
         nintvl = lastint - firstint + 1
         ! loop through intervals
         do ii=firstint,lastint
@@ -510,8 +510,8 @@ subroutine WriteWellConnections(this)
           do nn = firstnode,lastnode
             ! Get layer
             il = nint(mnwnod(1, nn))
-            write(iu,30)iw, nn, il, ir, ic, scrn_top, scrn_bot, hk_skin, &
-                        radius_skin
+            write(iu,30) iw, nn - firstnode + 1, il, ir, ic, scrn_top, &
+                         scrn_bot, hk_skin, radius_skin
           enddo
         enddo
       endif