remove spurious changes

wpbonelli · Oct 2, 2023 · 5083704 · 5083704
1 parent ec45eaf
commit 5083704
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 17 deletions.
diff --git a/msvs/mf6core.vfproj b/msvs/mf6core.vfproj
@@ -443,5 +443,5 @@
 			<FileConfiguration Name="Release|Win32">
 				<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration></File>
 		<File RelativePath="..\src\simnamidm.f90"/>
-		<File RelativePath="..\src\SimulationCreate.F90"/></Filter></Files>
+		<File RelativePath="..\src\SimulationCreate.f90"/></Filter></Files>
 	<Globals/></VisualStudioProject>
diff --git a/msvs/mf6lib.vfproj b/msvs/mf6lib.vfproj
@@ -162,5 +162,5 @@
 		<File RelativePath="..\src\Utilities\version.f90"/></Filter>
 		<File RelativePath="..\src\mf6lib.f90"/>
 		<File RelativePath="..\src\mf6lists.f90"/>
-		<File RelativePath="..\src\SimulationCreate.F90"/></Filter></Files>
+		<File RelativePath="..\src\SimulationCreate.f90"/></Filter></Files>
 	<Globals/></VisualStudioProject>
diff --git a/src/Model/GroundWaterFlow/gwf3npf8.f90 b/src/Model/GroundWaterFlow/gwf3npf8.f90
@@ -1075,13 +1075,19 @@ subroutine npf_print_model_flows(this, ibudfl, flowja)
     return
   end subroutine npf_print_model_flows
 
-  !> @brief Deallocate variables
   subroutine npf_da(this)
+! ******************************************************************************
+! npf_da -- Deallocate variables
+! ******************************************************************************
+!
+!    SPECIFICATIONS:
+! ------------------------------------------------------------------------------
     ! -- modules
     use MemoryManagerExtModule, only: memorylist_remove
     use SimVariablesModule, only: idm_context
     ! -- dummy
     class(GwfNpftype) :: this
+! ------------------------------------------------------------------------------
     !
     ! -- Deallocate input memory
     call memorylist_remove(this%name_model, 'NPF', idm_context)

diff --git a/src/Model/GroundWaterTransport/gwt1fmi1.f90 b/src/Model/GroundWaterTransport/gwt1fmi1.f90
@@ -59,8 +59,8 @@ module GwtFmiModule
     procedure :: initialize_gwfterms_from_bfr
     procedure :: initialize_gwfterms_from_gwfbndlist
     procedure :: read_options => gwtfmi_read_options
-    procedure :: read_packagedata => gwtfmi_read_packagedata
     procedure :: set_aptbudobj_pointer
+    procedure :: read_packagedata => gwtfmi_read_packagedata
 
   end type GwtFmiType
 

diff --git a/src/Model/ModelUtilities/BoundaryPackage.f90 b/src/Model/ModelUtilities/BoundaryPackage.f90
@@ -49,14 +49,14 @@ module BndModule
     ! -- characters
     character(len=LENLISTLABEL), pointer :: listlabel => null() !< title of table written for RP
     character(len=LENPACKAGENAME) :: text = '' !< text string for package flow term
-    character(len=LENAUXNAME), dimension(:), pointer &
-      , contiguous :: auxname => null() !< vector of auxname
-    type(CharacterStringType), dimension(:), pointer &
-      , contiguous :: auxname_cst => null() !< copy of vector auxname that can be stored in memory manager
-    character(len=LENBOUNDNAME), dimension(:), pointer &
-      , contiguous :: boundname => null() !< vector of boundnames
-    type(CharacterStringType), dimension(:), pointer &
-      , contiguous :: boundname_cst => null() !< copy of vector boundname that can be stored in memory manager
+    character(len=LENAUXNAME), dimension(:), pointer, &
+      contiguous :: auxname => null() !< vector of auxname
+    type(CharacterStringType), dimension(:), pointer, &
+      contiguous :: auxname_cst => null() !< copy of vector auxname that can be stored in memory manager
+    character(len=LENBOUNDNAME), dimension(:), pointer, &
+      contiguous :: boundname => null() !< vector of boundnames
+    type(CharacterStringType), dimension(:), pointer, &
+      contiguous :: boundname_cst => null() !< copy of vector boundname that can be stored in memory manager
     !
     ! -- scalars
     integer(I4B), pointer :: isadvpak => null() !< flag indicating package is advanced (1) or not (0)

diff --git a/src/Utilities/BlockParser.f90 b/src/Utilities/BlockParser.f90
@@ -569,8 +569,9 @@ end function GetUnit
   !> @ brief Development option
   !!
   !! Method that will cause the program to terminate with an error if the
-  !! IDEVELOPMODE flag is set to 0. This is used to allow develop options
-  !! to be specified for development testing but not for public releases.
+  !! IDEVELOPMODE flag is set to 1.  This is used to allow develop options
+  !! to be specified for development testing but not for the public release.
+  !! For the public release, IDEVELOPMODE is set to zero.
   !!
   !<
   subroutine DevOpt(this)

diff --git a/src/Utilities/Idm/mf6blockfile/LoadMf6File.f90 b/src/Utilities/Idm/mf6blockfile/LoadMf6File.f90
@@ -469,7 +469,7 @@ subroutine parse_structarray_block(parser, mf6_input, iblock, mshape, &
           cycle
         end if
         !
-        ! -- set indexes (where first column is blocknum)
+        ! -- set indexex (where first column is blocknum)
         iwords = icol
       else
         !

diff --git a/src/Utilities/OutputControl/OutputControl.f90 b/src/Utilities/OutputControl/OutputControl.f90
@@ -1,7 +1,7 @@
 !> @brief This module contains the OutputControlModule
 !!
 !! This module defines the OutputControlType.  This type
-!! is overridden by GWF and GWT to create an Output Control
+!! is overriden by GWF and GWT to create an Output Control
 !! package for the model.
 !!
 !<

diff --git a/src/meson.build b/src/meson.build
@@ -280,7 +280,7 @@ modflow_sources = files(
     'mf6core.f90',
     'mf6lists.f90',
     'simnamidm.f90',
-    'SimulationCreate.F90',
+    'SimulationCreate.f90',
     'RunControl.f90',
     'RunControlFactory.F90'
 )
-Original file line number
+Diff line change
@@ Expand Up @@
               cycle
             end if
             !
-            ! -- set indexes (where first column is blocknum)
+            ! -- set indexex (where first column is blocknum)
             iwords = icol
           else
             !
@@ Expand Down @@