Skip to content

Commit

Permalink
Add FDS 6.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
JakeOShannessy committed Mar 26, 2024
1 parent 46eb009 commit eb7f4a0
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 0 deletions.
17 changes: 17 additions & 0 deletions fds/6.9.0.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
%global version_dir %{this_version}
%global script_suffix %{version_suffix}
%undefine arch_suffix
%{!?build_openmpi:%global build_openmpi 1}
%{!?build_mpich:%global build_mpich 1}
%{!?build_intelmpi:%global build_intelmpi 1}
%{!?build_docs:%global build_docs 0}
%global gnu_string ompi_gnu_linux
%global mpich_string mpich_gnu_linux
%global intel_string impi_intel_linux_openmp
%global build_dir Build
%global openmpi_build_command ./make_fds.sh
%global intelmpi_build_command ./make_fds.sh
%global mpich_build_command \
dir=$(pwd) \
target=${dir##*/} \
make VPATH="../../Source" -f ../makefile %{gnu_string}
23 changes: 23 additions & 0 deletions fds/version0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--- a/Build/makefile
+++ b/Build/makefile
@@ -34,9 +34,9 @@ else
else
GIT_STAT := -dirty
endif
- GIT_DATE := $(shell git log -1 --format=%cd)
+ GIT_DATE := $(shell date "+%b %d, %Y %T" --date='@${SOURCE_DATE_EPOCH}')
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
- BUILD_DATE := $(shell date "+%b %d, %Y %T")
+ BUILD_DATE := $(shell date "+%b %d, %Y %T" --date='@${SOURCE_DATE_EPOCH}')
# The preprocessor used by xlf uses comma as separation between preprocessing commands.
# Commas needs to be escaped if they are to be used as part of a value in a preprocessing variable.
BUILD_DATE_XLF := $(shell date "+%b %d\, %Y %T")
@@ -44,7 +44,7 @@ else
CLT_VERSION := $(shell ../Scripts/osx_clt.sh)
endif

-GITINFO_BASE=-DGITHASH_PP=\"$(GIT_HASH)$(GIT_STAT)-$(GIT_BRANCH)\" -DGITDATE_PP=\""$(GIT_DATE)\""
+GITINFO_BASE=-DGITHASH_PP=\"$(build_version)+g$(commit)$(compiler)$(mpi)$(mkl)\" -DGITDATE_PP=\""$(GIT_DATE)\""
GITINFO=-fpp $(GITINFO_BASE) -DBUILDDATE_PP=\""$(BUILD_DATE)\""
GITINFOGNU=-cpp $(GITINFO_BASE) -DBUILDDATE_PP=\""$(BUILD_DATE)\""
GITINFOXLF=-qsuffix=cpp=f90 '-WF,-DGITHASH_PP=\"$(GIT_HASH)\",-DGITDATE_PP=\"$(GIT_DATE)\",-DBUILDDATE_PP=\"$(BUILD_DATE_XLF)\"'
1 change: 1 addition & 0 deletions fds/versions.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
version,repo,commit,date,version_patch,backports_patch
6.9.0,fds,63395692607884566fdedb5db4b5b4d98d3bcafb,1710957557,version0.patch,backports0.patch
6.8.0,fds,886e0096535519b7358a3c4393c91da3caee5072,1681816000,version1.patch,backports0.patch
6.7.9,fds,ec52dee4274fcf994d358c8b0f883eec8f67e041,1656268600,version1.patch,backports0.patch
6.7.8,fds,fbf3e11eee06c89b85fcc936e592bcf27bb9827f,1653430065,version1.patch,backports0.patch
Expand Down

0 comments on commit eb7f4a0

Please sign in to comment.