git submodules updated

AquaticEcoDynamics · Apr 10, 2024 · 2e57334 · 2e57334
1 parent 9b3b32b
commit 2e57334
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 4 deletions.
diff --git a/build_lnx.sh b/build_lnx.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+cd $GITHUB_WORKSPACE/fv-source
+./build_aed-fv.sh
+mkdir -p $GITHUB_WORKSPACE/binaries/ubuntu/20.04
+cp -r $GITHUB_WORKSPACE/fv-source/binaries/ubuntu/20.04/* $GITHUB_WORKSPACE/binaries/ubuntu/20.04/.
+
+# git config --global user.name "github-actions[bot]"
+# git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+# git pull
+# git add -A
+# git commit -m "Update Ubuntu 20.04 binaries"
+# git push
diff --git a/build_win.sh b/build_win.sh
@@ -0,0 +1,17 @@
+# #!/bin/sh
+#
+export GITHUB_WORKSPACE=`pwd`
+
+cd $GITHUB_WORKSPACE/fv-source/libaed-fv/win
+cmd.exe '/c build_fv.bat'
+echo '========================='
+cd $GITHUB_WORKSPACE/fv-source/libaed-fv/win/x64-Release
+mkdir -p tuflowfv_external_wq
+export VERSION=`grep FV_AED_VERS ../../src/fv_aed.F90 | grep define | cut -f2 -d\"`
+mv tuflowfv_external_wq.??? tuflowfv_external_wq
+powershell -Command "Compress-Archive -LiteralPath tuflowfv_external_wq -DestinationPath tuflowfv_external_wq_$VERSION.zip"
+echo 
+if [ ! -d $GITHUB_WORKSPACE/binaries/windows ] ; then
+  mkdir -p $GITHUB_WORKSPACE/binaries/windows
+fi
+cp tuflowfv_external_wq_$VERSION.zip $GITHUB_WORKSPACE/binaries/windows
diff --git a/fv-source/libaed-benthic b/fv-source/libaed-benthic
diff --git a/fv-source/libaed-demo b/fv-source/libaed-demo
diff --git a/fv-source/libaed-fv b/fv-source/libaed-fv
diff --git a/fv-source/libaed-water b/fv-source/libaed-water
diff --git a/inst_comp_win.sh b/inst_comp_win.sh
@@ -0,0 +1,8 @@
+# Although VS-2019 is already installed it's missing some parts needed, so we do it anyway
+curl -SL --ssl-no-revoke --output vs_community.exe https://aka.ms/vs/16/release/vs_community.exe
+./vs_community.exe --quiet --norestart --wait --add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended
+#
+curl -SL --ssl-no-revoke --output w_fortran-compiler_p_2023.0.0.25579_offline.exe https://registrationcenter-download.intel.com/akdlm/irc_nas/19107/w_fortran-compiler_p_2023.0.0.25579_offline.exe
+mkdir tmp
+./w_fortran-compiler_p_2023.0.0.25579_offline.exe -s -f tmp -a --silent --cli --action install --eula accept
+
+2 −2		Makefile
+1 −1		src/aed_benthic.F90
+1 −1		src/aed_bivalve.F90
+1 −1		src/aed_habitat_benthic.F90
+1 −1		src/aed_habitat_chara.F90
+1 −1		src/aed_habitat_galaxiid.F90
+1 −1		src/aed_habitat_ruppia.F90
+1 −1		src/aed_habitat_seagrass.F90
+6 −1		src/aed_macroalgae.F90
+1 −1		src/aed_macroalgae2.F90
+1 −1		src/aed_macrophyte.F90
+178 −108		build_aed-fv.sh
+1 −1		clean_aed-fv.sh
+4 −4		win/libfvaed+.rc
+4 −4		win/libfvaed.rc