refactor: add commit hash to version string

Author: wpbonelli

meson.build

@@ -3,14 +3,21 @@ project(
   'fortran',
   version: '6.8.0.dev0',
   license: 'CC0',
-  meson_version: '>= 1.3.1',
+  meson_version: '>= 1.7.0',
   default_options : [
     'b_vscrt=static_from_buildtype', # Link runtime libraries statically on Windows
     'buildtype=release',
     'debug=false',
     'fortran_std=f2018',
 ])
 
+version_f90 = vcs_tag(
+    command: ['git', 'rev-parse', '--short', 'HEAD'],
+    input:  'src/Utilities/version.f90.in',
+    output: 'version.f90',
+    replace_string: '@VCS_TAG@',
+  )
+
 if get_option('buildtype') == 'release'
   profile = 'release'
 else

pixi.toml

@@ -17,7 +17,7 @@ gitpython = "*"
 jinja2 = ">=3.1.5,<4"
 jupytext = "*"
 matplotlib = "*"
-meson = ">=1.3.1"
+meson = ">=1.7.0"
 netCDF4 = "*"
 networkx = "*"
 ninja = "*"

src/Utilities/Export/NCModel.f90

@@ -199,7 +199,7 @@ end subroutine epkg_destroy
   !> @brief set netcdf file scoped attributes
   !<
   subroutine set(this, modelname, modeltype, modelfname, nctype, disenum)
-    use VersionModule, only: VERSION
+    use VersionModule, only: FULLVERSION
     class(NCExportAnnotation), intent(inout) :: this
     character(len=*), intent(in) :: modelname
     character(len=*), intent(in) :: modeltype
@@ -260,7 +260,7 @@ subroutine set(this, modelname, modeltype, modelfname, nctype, disenum)
     this%model = trim(modeltype)//'6: '//trim(modelname)
 
     ! modflow6 version string
-    this%source = 'MODFLOW 6 '//trim(adjustl(VERSION))
+    this%source = 'MODFLOW 6 '//trim(adjustl(FULLVERSION))
 
     ! create timestamp
     call date_and_time(values=values)

src/Utilities/comarg.f90

@@ -3,7 +3,7 @@ module CommandArguments
   use ConstantsModule, only: LINELENGTH, LENBIGLINE, LENHUGELINE, &
                              VSUMMARY, VALL, VDEBUG, &
                              MVALIDATE
-  use VersionModule, only: VERSION, MFVNAM, IDEVELOPMODE, &
+  use VersionModule, only: VERSION, FULLVERSION, MFVNAM, IDEVELOPMODE, &
                            FMTDISCLAIMER, write_license
   use CompilerVersion
   use SimVariablesModule, only: istdout, isim_level, &
@@ -72,7 +72,7 @@ subroutine GetCommandLineArguments()
     call get_compile_date(cdate)
     write (header, '(a,4(1x,a),a)') &
       trim(adjustl(cexe)), '- MODFLOW', &
-      trim(adjustl(VERSION)), '(compiled', trim(adjustl(cdate)), ')'
+      trim(adjustl(FULLVERSION)), '(compiled', trim(adjustl(cdate)), ')'
     !
     ! -- check for silent option
     do iarg = 1, icountcmd

src/Utilities/version.f90 src/Utilities/version.f90.insrc/Utilities/version.f90 renamed to src/Utilities/version.f90.in

@@ -18,8 +18,10 @@ module VersionModule
   ! -- modflow 6 version
   integer(I4B), parameter :: IDEVELOPMODE = 1
   character(len=*), parameter :: VERSIONNUMBER = '6.8.0.dev0'
-  character(len=*), parameter :: VERSIONTAG = ' (preliminary) 02/06/2026'
-  character(len=40), parameter :: VERSION = VERSIONNUMBER//VERSIONTAG
+  character(len=*), parameter :: VERSIONQUALIFIER = ' (preliminary) 02/06/2026'
+  character(len=40), parameter :: VERSIONTAG = "@VCS_TAG@"
+  character(len=40), parameter :: FULLVERSION = VERSIONNUMBER//VERSIONQUALIFIER
+  character(len=40), parameter :: VERSION = VERSIONNUMBER//'+'//VERSIONTAG
   character(len=2), parameter :: MFVNAM = ' 6'
   character(len=*), parameter :: MFTITLE = &
     &'U.S. GEOLOGICAL SURVEY MODULAR HYDROLOGIC MODEL'
@@ -129,7 +131,7 @@ subroutine write_listfile_header(iout, cmodel_type, write_sys_command, &
     end if
     !
     ! -- Write version
-    call write_message_centered(text='VERSION '//VERSION, &
+    call write_message_centered(text='VERSION '//FULLVERSION, &
                                 linelen=iheader_width, iunit=iout)
     !
     ! -- Write if develop mode

src/meson.build

@@ -495,13 +495,12 @@ modflow_sources = files(
     'Utilities' / 'Table.f90',
     'Utilities' / 'TableTerm.f90',
     'Utilities' / 'Timer.f90',
-    'Utilities' / 'version.f90',
     'mf6core.f90',
     'mf6lists.f90',
     'SimulationCreate.f90',
     'RunControl.f90',
     'RunControlFactory.F90'
-)
+) + [version_f90]
 
 modflow_petsc_sources = files(
   'Utilities' / 'Vector' / 'PetscVector.F90',

utils/mf5to6/src/Preproc/GlobalVariables.f90

@@ -1,7 +1,7 @@
 module GlobalVariablesModule
 
   use ConstantsModule, only: MAXCHARLEN
-  use VersionModule, only: VERSION
+  use VersionModule, only: FULLVERSION
   use OpenSpecModule,  only: ACCESS, ACTION, FORM
 
   implicit none
@@ -16,7 +16,7 @@ module GlobalVariablesModule
   character(len=48) :: mfvnam
   parameter (prognamconv='Mf5to6')
   parameter (prognamlong=trim(prognamconv)//' - Converter for MODFLOW (2005, NWT, LGR) to MODFLOW 6')
-  parameter (mfvnam='Version ' // VERSION)
+  parameter (mfvnam='Version ' // FULLVERSION)
   integer  :: ngrid = 0
   integer  :: ilgr, ilunit, ngrids
   integer, parameter :: NIUNIT=100

utils/zonebudget/src/zbud6.f90

@@ -1,7 +1,7 @@
 program zonbudmf6
   use KindModule
   use ConstantsModule, only: LINELENGTH, LENHUGELINE
-  use VersionModule, only: VERSION
+  use VersionModule, only: FULLVERSION
   use SimVariablesModule, only: iout, errmsg
   use SimModule, only: store_error
   use MessageModule, only: write_message, write_message_centered
@@ -23,7 +23,7 @@ program zonbudmf6
   ! -- Write title to screen
   call write_message_centered('ZONEBUDGET'//mfvnam, 80)
   call write_message_centered('U.S. GEOLOGICAL SURVEY', 80)
-  call write_message_centered('VERSION '//VERSION, 80)
+  call write_message_centered('VERSION '//FULLVERSION, 80)
   !
   ! -- Find name of zone budget name file and lst file
   fnam = 'zbud.nam'
@@ -39,7 +39,7 @@ program zonbudmf6
   call openfile(iunit_lst, 0, flst, 'LIST', filstat_opt='REPLACE')
   call write_message_centered('ZONEBUDGET'//mfvnam, 80, iunit=iout)
   call write_message_centered('U.S. GEOLOGICAL SURVEY', 80, iunit=iout)
-  call write_message_centered('VERSION '//VERSION, 80, iunit=iout)
+  call write_message_centered('VERSION '//FULLVERSION, 80, iunit=iout)
   !
   ! -- Open name file, read name file, and open csv file
   call openfile(iunit_nam, iout, fnam, 'NAM')