Merge pull request firemodels#12316 from gforney/master

correction to validation table generating script - fds git revision format changed
mcgratta · Dec 29, 2023 · 583fffd · 583fffd
2 parents 662614c + 9fc70b2
commit 583fffd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/Utilities/Scripts/validation_git_stats.sh b/Utilities/Scripts/validation_git_stats.sh
@@ -12,6 +12,10 @@ gitrev=`head -1 $gitrevisions`
 if [ "$gitrev" != "" ] ; then
   gitrevshort=`echo $gitrev | awk -F - '{print $3}' | sed 's/^.\{1\}//'`
   gitdate=`git show -s --format=%aD $gitrevshort 2> /dev/null | head -1 | awk '{print $3,$2",",$4}'`
+  if [ "$gitdate" == "" ]; then
+    gitrevshort=`echo $gitrev | awk -F - '{print $4}' | sed 's/^.\{1\}//'`
+    gitdate=`git show -s --format=%aD $gitrevshort 2> /dev/null | head -1 | awk '{print $3,$2",",$4}'`
+  fi
   if [ "$gitdate" == "" ]; then
     gitdate="undefined"
     gitdate2=2000000000

diff --git a/Utilities/test_mpi/makefile b/Utilities/test_mpi/makefile
@@ -65,6 +65,13 @@ ompi_intel_osx: obj = test_mpi
 ompi_intel_osx: $(obj_mpi)
 	$(FCOMPL) -o $(obj) $(FFLAGS) $(LFLAGS) $(obj_mpi)
 
+ompi_gnu_osx: FFLAGS = -m64 -O2 -traceback -no-wrap-margin
+ompi_gnu_osx: LFLAGS = -static-intel -ld_classic
+ompi_gnu_osx: FCOMPL = mpifort
+ompi_gnu_osx: obj = test_mpi
+ompi_gnu_osx: $(obj_mpi)
+	$(FCOMPL) -o $(obj) $(FFLAGS) $(LFLAGS) $(obj_mpi)
+
 #*** Clean Target to remove Object and Module files ***
 
 .PHONY : clean