From a7e6bdfd44d390df973e4777f377d99ac02a6b5a Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Fri, 6 Apr 2018 15:58:07 +0200
Subject: [PATCH] Bug fix in procedure get_1_outerm.
---
GNUmakefile | 11 ++++++++++-
get_1_outerm.f | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index 7c713820..29fb4151 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -48,6 +48,15 @@ endif
SHELL = bash
LINK.o = $(FC) $(LDFLAGS) $(TARGET_ARCH)
+
+%.o: %.f
+ @echo "Building $@..."
+ @$(COMPILE.f) $(OUTPUT_OPTION) $<
+
+%: %.o
+ @echo "Linking $@..."
+ @$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
+
.DELETE_ON_ERROR:
.PHONY: all clean clobber depend
all: ${execut} log
@@ -77,7 +86,7 @@ clobber: clean
log:
hostname >$@
${FC} ${version_flag} >>$@ 2>&1
- echo -e "\nFC = ${FC}\n\nCPPFLAGS = ${CPPFLAGS}\n\nFFLAGS = ${FFLAGS}\n\nLDLIBS = ${LDLIBS}\n\nLDFLAGS = ${LDFLAGS}" >>$@
+ @echo -e "\nFC = ${FC}\n\nCPPFLAGS = ${CPPFLAGS}\n\nFFLAGS = ${FFLAGS}\n\nLDLIBS = ${LDLIBS}\n\nLDFLAGS = ${LDFLAGS}" >>$@
ifneq ($(MAKECMDGOALS), clobber)
include ${makefile_dir}/depend.mk
diff --git a/get_1_outerm.f b/get_1_outerm.f
index 70cf4a4b..657188ba 100644
--- a/get_1_outerm.f
+++ b/get_1_outerm.f
@@ -63,7 +63,7 @@ contains
if (get_1_outerm%n_points == 0) then
! null ssh contour
get_1_outerm%ssh = missing_ssh
- get_1_outerm%area = 0.
+ get_1_outerm%area = - 1.
else
level_good = innermost_level
mask = ssh /= huge(0.)
--
GitLab