diff --git a/make/makefile b/make/makefile index ff39784171c..e0c00d9cbf2 100644 --- a/make/makefile +++ b/make/makefile @@ -322,7 +322,6 @@ $(OBJDIR)/comarg.o \ $(OBJDIR)/mf6core.o \ $(OBJDIR)/BaseGeometry.o \ $(OBJDIR)/mf6.o \ -$(OBJDIR)/genericutils.o \ $(OBJDIR)/StringList.o \ $(OBJDIR)/MemorySetHandler.o \ $(OBJDIR)/ilut.o \ diff --git a/msvs/mf6lib.vfproj b/msvs/mf6lib.vfproj index 7186195f1e3..dee2f209199 100644 --- a/msvs/mf6lib.vfproj +++ b/msvs/mf6lib.vfproj @@ -143,7 +143,6 @@ - diff --git a/pymake/makefile b/pymake/makefile index 484e7798cf0..8e7065a0d6d 100644 --- a/pymake/makefile +++ b/pymake/makefile @@ -114,7 +114,6 @@ $(OBJDIR)/GwfNpfOptions.o \ $(OBJDIR)/GwfBuyInputData.o \ $(OBJDIR)/ims8misc.o \ $(OBJDIR)/LinearSolverBase.o \ -$(OBJDIR)/genericutils.o \ $(OBJDIR)/ArrayHandlers.o \ $(OBJDIR)/IndexMap.o \ $(OBJDIR)/version.o \ diff --git a/src/Utilities/genericutils.f90 b/src/Utilities/genericutils.f90 deleted file mode 100644 index e6921da9dd6..00000000000 --- a/src/Utilities/genericutils.f90 +++ /dev/null @@ -1,66 +0,0 @@ -!> @brief This module contains generic utilties -!! -!! This module contains generic utilities that have -!! limited dependencies. -!! -!< -module GenericUtilitiesModule - use KindModule, only: DP, I4B, LGP - use ConstantsModule, only: MAXCHARLEN, LENHUGELINE, & - DZERO, DPREC, DSAME, & - LINELENGTH, LENHUGELINE, VSUMMARY - use SimVariablesModule, only: istdout, isim_level - ! - implicit none - - private - - public :: is_same - -contains - - !> @brief Function to determine if two reals are the same - !! - !! Function to evaluate if the difference between a and b are less than eps - !! (i.e. a and b are the same). - !! - !< - function is_same(a, b, eps) result(lvalue) - ! -- return variable - logical(LGP) :: lvalue !< boolean indicating if a and b are the same - ! -- dummy variables - real(DP), intent(in) :: a !< first number to evaluate - real(DP), intent(in) :: b !< second number to evaluate - real(DP), intent(in), optional :: eps !< optional maximum difference between a abd b (default=DSAME) - ! -- local variables - real(DP) :: epsloc - real(DP) :: denom - real(DP) :: rdiff - ! - ! -- evaluate optioanl arguments - if (present(eps)) then - epsloc = eps - else - epsloc = DSAME - end if - lvalue = .FALSE. - if (a == b) then - lvalue = .TRUE. - else - if (abs(b) > abs(a)) then - denom = b - else - denom = a - if (abs(denom) == DZERO) then - denom = DPREC - end if - end if - rdiff = abs((a - b) / denom) - if (rdiff <= epsloc) then - lvalue = .TRUE. - end if - end if - - end function is_same - -end module GenericUtilitiesModule diff --git a/src/meson.build b/src/meson.build index 800accc6553..e77d9891412 100644 --- a/src/meson.build +++ b/src/meson.build @@ -227,7 +227,6 @@ modflow_sources = files( 'Utilities' / 'defmacro.F90', 'Utilities' / 'DevFeature.f90', 'Utilities' / 'ErrorUtil.f90', - 'Utilities' / 'genericutils.f90', 'Utilities' / 'GeomUtil.f90', 'Utilities' / 'HashTable.f90', 'Utilities' / 'HeadFileReader.f90', diff --git a/utils/mf5to6/make/makefile b/utils/mf5to6/make/makefile index cf5a330df39..fd923f00ba0 100644 --- a/utils/mf5to6/make/makefile +++ b/utils/mf5to6/make/makefile @@ -176,7 +176,6 @@ $(OBJDIR)/Exchange.o \ $(OBJDIR)/ExchangeWriter.o \ $(OBJDIR)/SimFileWriter.o \ $(OBJDIR)/NWT1_xmdlib.o \ -$(OBJDIR)/genericutils.o \ $(OBJDIR)/mf5to6.o \ $(OBJDIR)/SimVariablesPHMF.o \ $(OBJDIR)/NWT1_xmd.o \ diff --git a/utils/mf5to6/msvs/mf5to6.vfproj b/utils/mf5to6/msvs/mf5to6.vfproj index f206d7d30aa..10ff7233751 100644 --- a/utils/mf5to6/msvs/mf5to6.vfproj +++ b/utils/mf5to6/msvs/mf5to6.vfproj @@ -103,7 +103,6 @@ - diff --git a/utils/mf5to6/pymake/extrafiles.txt b/utils/mf5to6/pymake/extrafiles.txt index 890817ead2d..f8a3888f945 100644 --- a/utils/mf5to6/pymake/extrafiles.txt +++ b/utils/mf5to6/pymake/extrafiles.txt @@ -9,7 +9,6 @@ ../../../src/Utilities/Constants.f90 ../../../src/Utilities/SimVariables.f90 ../../../src/Utilities/compilerversion.F90 -../../../src/Utilities/genericutils.f90 ../../../src/Utilities/Message.f90 ../../../src/Utilities/ErrorUtil.f90 ../../../src/Utilities/GeomUtil.f90 diff --git a/utils/zonebudget/make/makefile b/utils/zonebudget/make/makefile index 314e3782921..0a848b02b10 100644 --- a/utils/zonebudget/make/makefile +++ b/utils/zonebudget/make/makefile @@ -38,7 +38,6 @@ $(OBJDIR)/zoneoutput.o \ $(OBJDIR)/grb.o \ $(OBJDIR)/budgetdata.o \ $(OBJDIR)/GeomUtil.o \ -$(OBJDIR)/genericutils.o \ $(OBJDIR)/zbud6.o # Define the objects that make up the program diff --git a/utils/zonebudget/msvs/zonebudget.vfproj b/utils/zonebudget/msvs/zonebudget.vfproj index f24872d4846..f6e8613efd2 100644 --- a/utils/zonebudget/msvs/zonebudget.vfproj +++ b/utils/zonebudget/msvs/zonebudget.vfproj @@ -44,7 +44,6 @@ - diff --git a/utils/zonebudget/pymake/extrafiles.txt b/utils/zonebudget/pymake/extrafiles.txt index 9c4200fab4e..54d11147ff3 100644 --- a/utils/zonebudget/pymake/extrafiles.txt +++ b/utils/zonebudget/pymake/extrafiles.txt @@ -4,7 +4,6 @@ ../../../src/Utilities/Budget.f90 ../../../src/Utilities/Constants.f90 ../../../src/Utilities/compilerversion.F90 -../../../src/Utilities/genericutils.f90 ../../../src/Utilities/ErrorUtil.f90 ../../../src/Utilities/GeomUtil.f90 ../../../src/Utilities/MathUtil.f90