put back aed2, started ground-water option

Author: casper-boon

GLM_CONFIG

@@ -3,6 +3,7 @@
 #
 
 #export FABM=true
+export AED2=true
 export AED=true
 export USE_DL=false
 export WITH_PLOTS=true
@@ -20,6 +21,8 @@ export WITH_XPLOTS=true
 export CURDIR=`pwd`
 export FABMDIR=${CURDIR}/../fabm-git
 export PLOTDIR=${CURDIR}/../libplot
+export AED2DIR=${CURDIR}/../libaed2
+export AED2PLS=${CURDIR}/../libaed2-plus
 export UTILDIR=${CURDIR}/../libutil
 
 export GLM_CONFIGURED=true

Makefile

@@ -154,6 +154,26 @@ ifeq ($(AED),true)
   GLM_DEPS+=$(AEDWATDIR)/lib/libaed-water.a
 endif
 
+ifeq ($(AED2),true)
+  DEFINES+=-DAED2
+
+  ifeq ($(AED2DIR),)
+    AED2DIR=../libaed2
+  endif
+
+  FINCLUDES+=-I$(AED2DIR)/include -I$(AED2DIR)/mod
+  AED2LIBS=-L$(AED2DIR)/lib -laed2
+  ifneq ("$(wildcard ${AED2PLS}/Makefile)","")
+    AED2PLBS=-L${AED2PLS}/lib -laed2+
+  endif
+
+  ifeq ($(USE_DL),true)
+    AED2TARGETS=libglm_wq_aed2.${so_ext}
+  endif
+
+  GLM_DEPS+=$(AED2DIR)/lib/libaed2.a
+endif
+
 FLIBS=
 # Select specific compiler bits
 ifeq ($(F90),ifort)
@@ -211,7 +231,7 @@ else
 endif
 
 ifneq ($(USE_DL),true)
-  WQLIBS=$(AEDLIBS) $(FABMLIBS)
+  WQLIBS=$(AEDLIBS) $(FABMLIBS) $(AED2LIBS)
 endif
 
 ifeq ($(DEBUG),true)
@@ -293,6 +313,9 @@ else
   else ifeq ($(FABM),true)
     OBJS+=${objdir}/glm_zones.o
   endif
+  ifeq ($(AED2),true)
+    OBJS+=${objdir}/glm_aed2.o
+  endif
   ifeq ($(AED),true)
     OBJS+=${objdir}/glm_aed.o \
           ${objdir}/aed_external.o

build_glm.sh

@@ -48,37 +48,40 @@ else
 fi
 
 
-# if FC is not defined we look for gfortran-8 first because some systems
-# will have gfortran at version 7 but also gfortran version 8 as gfortran-8
-# if we can't find gfortran default to ifort
+# see if FC is defined, if not look for gfortran at least v8
 if [ "$FC" = "" ] ; then
-  gfortran-8 -v > /dev/null 2>&1
+  gfortran -v > /dev/null 2>&1
   if [ $? != 0 ] ; then
-    gfortran -v > /dev/null 2>&1
-    if [ $? != 0 ] ; then
-      export FC=ifort
+    export FC=ifort
+  else
+    VERS=`gfortran -dumpversion | cut -d\. -f1`
+    if [ $VERS -ge 8 ] ; then
+      export FC=gfortran
     else
-      VERS=`gfortran -dumpversion | cut -d\. -f1`
-      if [ $VERS -ge 8 ] ; then
-        export FC=gfortran
-      else
+      gfortran-8 -v > /dev/null 2>&1
+      if [ $? != 0 ] ; then
         export FC=ifort
+      else
+        export gfortran-8
       fi
     fi
-  else
-    export FC=gfortran-8
   fi
 fi
 
 if [ "$FC" = "ifort" ] ; then
-   if [ -d /opt/intel/bin ] ; then
-      . /opt/intel/bin/compilervars.sh intel64
-   fi
-   which ifort > /dev/null 2>&1
-   if [ $? != 0 ] ; then
-      echo ifort compiler requested, but not found
-      exit 1
-   fi
+  # if trying the intel fortran, initialise it
+  if [ -d /opt/intel/oneapi ] ; then
+     . /opt/intel/oneapi/setvars.sh
+  else
+    if [ -d /opt/intel/bin ] ; then
+       . /opt/intel/bin/compilervars.sh intel64
+    fi
+    which ifort > /dev/null 2>&1
+    if [ $? != 0 ] ; then
+       echo ifort compiler requested, but not found
+       exit 1
+    fi
+  fi
 fi
 
 export F77=$FC
@@ -87,6 +90,9 @@ export F95=$FC
 
 export MPI=OPENMPI
 
+if [ "$AED2DIR" = "" ] ; then
+  export AED2DIR=../libaed2
+fi
 if [ "$PLOTDIR" = "" ] ; then
   export PLOTDIR=../libplot
 fi
@@ -125,6 +131,19 @@ if [ "$FABM" = "true" ] ; then
   ${MAKE} || exit 1
 fi
 
+if [ "${AED2}" = "true" ] ; then
+  cd ${AED2DIR}
+  ${MAKE} || exit 1
+  cd ..
+  if [ "${AED2PLS}" != "" ] ; then
+    if [ -d ${AED2PLS} ] ; then
+      cd ${AED2PLS}
+      ${MAKE} || exit 1
+      cd ..
+    fi
+  fi
+fi
+
 if [ "${AED}" = "true" ] ; then
   cd  ${CURDIR}/../libaed-water
   ${MAKE} || exit 1
@@ -171,9 +190,14 @@ if [ "$FC" = "flang" ] && [ -d flang_extra ] ; then
 fi
 
 cd ${CURDIR}
-/bin/rm obj/aed_external.o
+if [ -f obj/aed_external.o ] ; then
+  /bin/rm obj/aed_external.o
+fi
 ${MAKE} AEDBENDIR=$DAEDBENDIR AEDDMODIR=$DAEDDMODIR || exit 1
-/bin/rm obj/aed_external.o
-${MAKE} glm+ AEDBENDIR=$DAEDBENDIR AEDDMODIR=$DAEDDMODIR AEDRIPDIR=$DAEDRIPDIR AEDDEVDIR=$DAEDDEVDIR || exit 1
+if [ "${DAEDDEVDIR}" != "" -a -d ${DAEDDEVDIR} ] ; then
+  echo now build plus version
+  /bin/rm obj/aed_external.o
+  ${MAKE} glm+ AEDBENDIR=$DAEDBENDIR AEDDMODIR=$DAEDDMODIR AEDRIPDIR=$DAEDRIPDIR AEDDEVDIR=$DAEDDEVDIR || exit 1
+fi
 
 exit 0

debian/changelog

@@ -1,4 +1,4 @@
-glm (3.2.0a3-0) UNRELEASED; urgency=low
+glm (3.2.0a6-0) UNRELEASED; urgency=low
 
   [ Casper Boon ]
   * new version 3.0.0
@@ -11,8 +11,11 @@ glm (3.2.0a3-0) UNRELEASED; urgency=low
   * new version 3.2.0a1
   * new version 3.2.0a2
   * new version 3.2.0a3
+  * new version 3.2.0a4
+  * new version 3.2.0a5
+  * new version 3.2.0a6
 
- -- Casper Boon <casper@shark>  Fri, 27 Nov 2020 16:01:22 +0800
+ -- Casper Boon <casper@eridanus.aed-net.science.uwa.edu.au>  Fri, 30 Apr 2021 08:58:18 +0800
 
 glm (2.4.1-0) UNRELEASED; urgency=low
 

debian/rules

@@ -2,7 +2,7 @@
 
 package=glm
 year=2020
-version=3.2.0a3
+version=3.2.0a6
 release=0.0
 
 #export DH_VERBOSE=1

src/glm.h

@@ -35,7 +35,7 @@
 #endif
 #define USE_FILLVALUE 1
 
-#define GLM_VERSION  "3.2.0a4"
+#define GLM_VERSION  "3.2.0a6"
 
 #define POINT         0
 #define Z_SHAPE       1