fix conflicts

MODFLOW-USGS · Feb 10, 2024 · d01846c · d01846c
1 parent f6fb88b
commit d01846c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/src/Model/ModelUtilities/ModelPackageInput.f90 b/src/Model/ModelUtilities/ModelPackageInput.f90
@@ -48,12 +48,10 @@ subroutine supported_model_packages(mtype, pkgtypes, numpkgs)
       numpkgs = GWF_NBASEPKG + GWF_NMULTIPKG
       allocate (pkgtypes(numpkgs))
       pkgtypes = [GWF_BASEPKG, GWF_MULTIPKG]
-      !
     case ('GWT6')
       numpkgs = GWT_NBASEPKG + GWT_NMULTIPKG
       allocate (pkgtypes(numpkgs))
       pkgtypes = [GWT_BASEPKG, GWT_MULTIPKG]
-      !
     case ('GWE6')
       numpkgs = GWE_NBASEPKG + GWE_NMULTIPKG
       allocate (pkgtypes(numpkgs))
@@ -62,7 +60,6 @@ subroutine supported_model_packages(mtype, pkgtypes, numpkgs)
       numpkgs = PRT_NBASEPKG + PRT_NMULTIPKG
       allocate (pkgtypes(numpkgs))
       pkgtypes = [PRT_BASEPKG, PRT_MULTIPKG]
-      !
     case default
     end select
     !
@@ -106,6 +103,11 @@ function multi_package_type(mtype_component, ptype_component, pkgtype) &
     case ('GWE')
       do n = 1, GWE_NMULTIPKG
         if (GWE_MULTIPKG(n) == pkgtype) then
+          multi_package = .true.
+          exit
+        end if
+      end do
+      !
     case ('PRT')
       do n = 1, PRT_NMULTIPKG
         if (PRT_MULTIPKG(n) == pkgtype) then

diff --git a/src/Model/ParticleTracking/prt1.f90 b/src/Model/ParticleTracking/prt1.f90
@@ -203,7 +203,7 @@ subroutine prt_df(this)
 
     ! -- Define packages and utility objects
     call this%dis%dis_df()
-    call this%fmi%fmi_df(this%dis)
+    call this%fmi%fmi_df(this%dis, 1)
     call this%oc%oc_df()
     call this%budget%budget_df(NIUNIT_PRT, 'MASS', 'M')
 

diff --git a/src/Model/ParticleTracking/prt1fmi1.f90 b/src/Model/ParticleTracking/prt1fmi1.f90
@@ -134,15 +134,16 @@ subroutine fmi_ad(this)
   end subroutine fmi_ad
 
   !> @brief Define the flow model interface
-  subroutine prtfmi_df(this, dis)
+  subroutine prtfmi_df(this, dis, idryinactive)
     ! -- modules
     use SimModule, only: store_error
     ! -- dummy
     class(PrtFmiType) :: this
     class(DisBaseType), pointer, intent(in) :: dis
+    integer(I4B), intent(in) :: idryinactive
     !
     ! -- Call parent class define
-    call this%FlowModelInterfaceType%fmi_df(dis)
+    call this%FlowModelInterfaceType%fmi_df(dis, idryinactive)
     !
     ! -- Allocate arrays
     allocate (this%StorageFlows(this%dis%nodes)) ! kluge note: need allocate_arrays subroutine

diff --git a/utils/idmloader/scripts/dfn2f90.py b/utils/idmloader/scripts/dfn2f90.py
@@ -998,7 +998,6 @@ def _write_master_component(self, fh=None):
             SRC_PATH / "Model" / "GroundWaterTransport" / "gwt1ic1idm.f90",
         ],
         [
-<<<<<<< HEAD
             DFN_PATH / "gwe-dis.dfn",
             SRC_PATH / "Model" / "GroundWaterEnergy" / "gwe1dis1idm.f90",
         ],
@@ -1021,7 +1020,8 @@ def _write_master_component(self, fh=None):
         [
             DFN_PATH / "gwe-ic.dfn",
             SRC_PATH / "Model" / "GroundWaterEnergy" / "gwe1ic1idm.f90",
-=======
+        ],
+        [
             DFN_PATH / "prt-dis.dfn",
             SRC_PATH / "Model" / "ParticleTracking" / "prt1dis1idm.f90",
         ],
@@ -1032,7 +1032,6 @@ def _write_master_component(self, fh=None):
         [
             DFN_PATH / "prt-mip.dfn",
             SRC_PATH / "Model" / "ParticleTracking" / "prt1mip1idm.f90",
->>>>>>> 3e00ab25 (feat(PRT): add particle tracking model)
         ],
         [
             DFN_PATH / "gwf-nam.dfn",
@@ -1043,13 +1042,12 @@ def _write_master_component(self, fh=None):
             SRC_PATH / "Model" / "GroundWaterTransport" / "gwt1idm.f90",
         ],
         [
-<<<<<<< HEAD
             DFN_PATH / "gwe-nam.dfn",
             SRC_PATH / "Model" / "GroundWaterEnergy" / "gwe1idm.f90",
-=======
+        ],
+        [
             DFN_PATH / "prt-nam.dfn",
             SRC_PATH / "Model" / "ParticleTracking" / "prt1idm.f90",
->>>>>>> 3e00ab25 (feat(PRT): add particle tracking model)
         ],
         [
             DFN_PATH / "exg-gwfgwf.dfn",