git submodules updated

AquaticEcoDynamics · Mar 22, 2024 · ae421f0 · ae421f0
1 parent f519c43
commit ae421f0
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 13 deletions.
diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -200,6 +200,14 @@ jobs:
           mkdir -p $GITHUB_WORKSPACE/binaries/macos/${MOSDIR}
           cp -r $GITHUB_WORKSPACE/glm-source/binaries/macos/${MOSDIR}/* $GITHUB_WORKSPACE/binaries/macos/${MOSDIR}/.
  
+      - name: run GLM FCR
+        shell: bash
+        run: | 
+          cd glm-examples/FCR
+          echo now try running glm
+          $GITHUB_WORKSPACE/binaries/windows/glm_latest/glm.exe
+          echo run completed
+
       - name: update binaries and push to remote
         run: |
           git config --global user.name "github-actions[bot]"
@@ -243,13 +251,13 @@ jobs:
           cd $GITHUB_WORKSPACE/glm-source/binaries/windows
           cp -r * $GITHUB_WORKSPACE/binaries/windows
 
- #    - name: run GLM FCR
- #      shell: bash
- #      run: | 
- #        cd glm-examples/FCR
- #        echo now try running glm
- #        $GITHUB_WORKSPACE/binaries/windows/glm_latest/glm.exe
- #        echo run completed
+      - name: run GLM FCR
+        shell: bash
+        run: | 
+          cd glm-examples/FCR
+          echo now try running glm
+          $GITHUB_WORKSPACE/binaries/windows/glm_latest/glm.exe
+          echo run completed
 
       - name: update binaries and push to remote
         run: |

diff --git a/glm-source/GLM b/glm-source/GLM
diff --git a/glm-source/libaed-benthic b/glm-source/libaed-benthic
diff --git a/glm-source/libaed-demo b/glm-source/libaed-demo
diff --git a/glm-source/libaed-water b/glm-source/libaed-water
diff --git a/glm-source/libplot b/glm-source/libplot
diff --git a/glm-source/libutil b/glm-source/libutil
+6 −2		Makefile
+24 −15		build_glm.sh
+4 −2		debian/changelog
+2 −2		debian/rules
+1 −1		freebsd/create_pkg.sh
+1 −1		include/libglm.h
+2 −2		src/glm.h
+1 −1		src/glm_aed.F90
+1 −1		src/glm_aed2.F90
+1 −1		src/glm_balance.c
+1 −1		src/glm_balance.h
+1 −1		src/glm_bird.c
+1 −1		src/glm_bird.h
+1 −1		src/glm_const.c
+1 −1		src/glm_const.h
+1 −1		src/glm_csv.c
+1 −1		src/glm_csv.h
+1 −1		src/glm_debug.c
+1 −1		src/glm_debug.h
+1 −1		src/glm_deep.c
+1 −1		src/glm_deep.h
+1 −1		src/glm_fabm.F90
+1 −1		src/glm_flow.c
+1 −1		src/glm_flow.h
+1 −1		src/glm_globals.c
+1 −1		src/glm_globals.h
+1 −1		src/glm_init.c
+1 −1		src/glm_init.h
+1 −1		src/glm_input.c
+1 −1		src/glm_input.h
+1 −1		src/glm_layers.c
+1 −1		src/glm_layers.h
+1 −1		src/glm_lnum.c
+1 −1		src/glm_lnum.h
+1 −1		src/glm_main.c
+1 −1		src/glm_mixer.c
+1 −1		src/glm_mixer.h
+1 −1		src/glm_mixu.c
+1 −1		src/glm_mixu.h
+1 −1		src/glm_mobl.c
+1 −1		src/glm_mobl.h
+1 −1		src/glm_model.c
+1 −1		src/glm_ncdf.c
+1 −1		src/glm_ncdf.h
+1 −1		src/glm_output.c
+1 −1		src/glm_output.h
+1 −1		src/glm_plot.c
+1 −1		src/glm_plot.h
+1 −1		src/glm_plugin.c
+1 −1		src/glm_plugin.h
+1 −1		src/glm_sizes.c
+1 −1		src/glm_stress.c
+1 −1		src/glm_stress.h
+19 −1		src/glm_surface.c
+1 −1		src/glm_surface.h
+1 −1		src/glm_types.F90
+1 −1		src/glm_types.h
+1 −1		src/glm_util.c
+1 −1		src/glm_util.h
+1 −1		src/glm_wqual.c
+1 −1		src/glm_wqual.h
+1 −1		src/glm_zones.F90
+1 −1		src/ode_solvers.F90
+5 −5		win/glm+.rc
+5 −5		win/glm.rc
+1 −2		Makefile
+2 −2		include/colours.h
+1 −1		include/libplot.h
+1 −1		include/plotter.h
+1 −1		include/ui_basic.h
+1 −1		src/colours.c
+1 −1		src/macbasic.m
+1 −1		src/plotter.c
+1 −1		src/winbasic.c
+1 −1		src/xbasic.c