Worked on importing existing MODFLOW 6 models.

MODFLOW-USGS · May 30, 2024 · 17d72e2 · 17d72e2
1 parent 5d0d355
commit 17d72e2
Show file tree

Hide file tree

Showing 7 changed files with 478 additions and 316 deletions.
diff --git a/MF6InputReader/Mf6.CustomMf6PersistentUnit.pas b/MF6InputReader/Mf6.CustomMf6PersistentUnit.pas
@@ -51,7 +51,9 @@   TMfCellId = record
     function SameLocation(OtherCellID: TMfCellId): Boolean;
   end;
 
-  TCellIdList = TList<TMfCellId>;
+  TCellIdList = class(TList<TMfCellId>)
+    procedure Sort;
+  end;
 
   TValueType = (vtNumeric, vtString);
 
@@ -2070,4 +2072,26 @@ procedure TDimensionedPackageReader.SetDimensions(const Value: TDimensions);
   end;
 end;
 
+{ TCellIdList }
+
+procedure TCellIdList.Sort;
+begin
+  inherited Sort(
+    TComparer<TMfCellId>.Construct(
+      function(const Left, Right: TMfCellId): Integer
+      begin
+        result := Left.Row - Right.Row;
+        if Result = 0 then
+        begin
+          result := Left.column - Right.column;
+          if result = 0 then
+          begin
+            result := Left.Layer - Right.Layer;
+          end;
+        end;
+      end
+    ));
+
+end;
+
 end.
diff --git a/ModelMuse/CustomModflowWriterUnit.pas b/ModelMuse/CustomModflowWriterUnit.pas
@@ -6269,7 +6269,10 @@ procedure TCustomListWriter.WriteStressPeriods(const VariableIdentifiers,
         begin
           if (ITMP < 0) and (NP = 0) and (FEvaluationType <> etExportCsv) then
           begin
-            Continue;
+            if not Model.ModflowPackages.MvrPackage.IsSelected then
+            begin
+              Continue;
+            end;
           end;
           if FEvaluationType <> etExportCsv then
           begin
@@ -6282,6 +6285,11 @@ procedure TCustomListWriter.WriteStressPeriods(const VariableIdentifiers,
         begin
           WriteCells := True;
         end;
+        if  (Model.ModelSelection = msModflow2015)
+          and Model.ModflowPackages.MvrPackage.IsSelected then
+        begin
+          WriteCells := True;
+        end;
 
         if WriteCells then
         begin

diff --git a/ModelMuse/Modflow2005ImporterUnit.pas b/ModelMuse/Modflow2005ImporterUnit.pas
@@ -5949,7 +5949,7 @@ procedure TDisImporter.ReadVariableTopElev;
   ALine := Trim(ALine);
   if ALine = 'TOP ELEVATION OF LAYER 1' then
   begin
-    Read2DRealArray(FElevations[0], 'Model_Top');
+    Read2DRealArray(FElevations[0], kModelTop);
   end
   else
   begin