From a3a45e6fcd4e53507cae8602fde127fcd4e99748 Mon Sep 17 00:00:00 2001
From: Douglas Guptill <douglas.guptill@dal.ca>
Date: Wed, 3 Jun 2009 19:14:20 +0000
Subject: [PATCH] updates from p690

---
 CASCADE/Makefile  |  7 ++++---
 DOUAR.f90         | 12 ++++++------
 Makefile          | 28 +++++++++++++++-------------
 Makefile.p690     | 38 ++++++++++++++++++++++++++------------
 NN/Makefile       | 15 +++++++++------
 OCTREE/Makefile   |  7 ++++---
 RESAMPLE/Makefile |  7 ++++---
 flush.f           |  2 +-
 8 files changed, 69 insertions(+), 47 deletions(-)

diff --git a/CASCADE/Makefile b/CASCADE/Makefile
index 80c671ef..c7a1cc10 100644
--- a/CASCADE/Makefile
+++ b/CASCADE/Makefile
@@ -53,9 +53,10 @@ del_flip.o
 all: $(LIBFILE)
 $(LIBFILE): $(OBJECTS) $(UTILS)
 	$(AR) -rv $(LIBFILE) $(OBJECTS) >$(LIBFILE).ar
-	echo "--"
-	echo "compiler output...."
-	more $(COMPILE_OUT)
+
+#	echo "--"
+#	echo "compiler output...."
+#	more $(COMPILE_OUT)
 
 .PHONY: objclean
 objclean:
diff --git a/DOUAR.f90 b/DOUAR.f90
index e6e8d9cf..68db5bdb 100644
--- a/DOUAR.f90
+++ b/DOUAR.f90
@@ -349,10 +349,10 @@ do while (istep.le.params%nstep)
 !      if (params%griditer .lt. 0 .and. current_level==params%levelmax_oct) converge=.true.
 
       if (iproc.eq.0 .and. params%debug>=1) then
-         write(*,'(a,L)') shift//'(1) params%griditer < 0               ',(params%griditer.lt.0) 
-         write(*,'(a,L)') shift//'(2) current_level==params%levelmax_oct',(current_level==params%levelmax_oct) 
-         write(*,'(a,L)') shift//'(3) increase_current_level            ',increase_current_level
-         write(*,'(a,L)') shift//'converge = (1) & (2) & (3) -> ',(params%griditer .lt. 0 .and. current_level==params%levelmax_oct .and. increase_current_level) 
+         write(*,'(a,L1)') shift//'(1) params%griditer < 0               ',(params%griditer.lt.0) 
+         write(*,'(a,L1)') shift//'(2) current_level==params%levelmax_oct',(current_level==params%levelmax_oct) 
+         write(*,'(a,L1)') shift//'(3) increase_current_level            ',increase_current_level
+         write(*,'(a,L1)') shift//'converge = (1) & (2) & (3) -> ',(params%griditer .lt. 0 .and. current_level==params%levelmax_oct .and. increase_current_level) 
       end if
 
 
@@ -448,7 +448,7 @@ do while (istep.le.params%nstep)
       write(*,'(a)')      shift//'After surfaces embedding:'
       write(*,'(a,i8,a)') shift//'nleaves_old= ',nleaves_old_mem2,' leaves'
       write(*,'(a,i8,a)') shift//'nleaves_new= ',nleaves_new_mem2,' leaves'
-      write(*,'(a,l)')    shift//'C2: authorise increase of refine level = ',increase_current_level
+      write(*,'(a,l1)')    shift//'C2: authorise increase of refine level = ',increase_current_level
       end if
 
       nleaves_old_mem1=nleaves_new_mem1
@@ -708,7 +708,7 @@ do while (istep.le.params%nstep)
          if (velocity_converged .and. increase_current_level) current_level=min(current_level+1,params%levelmax_oct)
 
          if (iproc.eq.0 .and. params%debug>=1) then
-            write(*,'(a,L)') shift//'increase_current_level ->',increase_current_level
+            write(*,'(a,L1)') shift//'increase_current_level ->',increase_current_level
             write(*,'(a,i2)') shift//'current_level ->',current_level
          end if
 
diff --git a/Makefile b/Makefile
index fb40290f..76a3bd18 100644
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,8 @@ create_surfaces.o \
 define_bc.o \
 define_bc_ritske.o \
 define_bc_ritske_isurf.o \
-define_bc_sphere.o\
-define_bc_riedel.o\
+define_bc_sphere.o \
+define_bc_riedel.o \
 define_bc_3Dpunch.o \
 define_bc_2Dpunch.o \
 define_bc_2Dpunch_vert.o \
@@ -36,16 +36,16 @@ define_bc_jgr.o \
 define_bc_subduction.o \
 define_bc_parallipipede.o \
 define_bc_model1.o \
-define_surface.o\
-define_cloud.o\
-define_ov.o\
+define_surface.o \
+define_cloud.o \
+define_ov.o \
 do_leaf_measurements.o \
 embed_surface_in_octree.o \
 erosion.o \
 find_void_nodes.o \
 flush.o \
 heap.o \
-improve_osolve.o\
+improve_osolve.o \
 initialize_temperature.o \
 interpolate_ov_on_osolve.o \
 interpolate_velocity_on_surface.o \
@@ -69,7 +69,7 @@ update_cloud_structure.o \
 update_cloud_fields.o \
 visualise_matrix.o \
 remove_point.o \
-wsmp_setup.o\
+wsmp_setup.o \
 DOUAR.o \
 write_global_output.o vrm.o
 
@@ -80,12 +80,14 @@ $(BIN): subdirs $(OBJECTS)
  1>$(BIN).link.stdout 2>$(BIN).link.stderr
 	$(F90) $(FFLAGS) $(OPTIONS) $(OBJECTS) $(LIBS) -o $(BIN) \
  1>>$(BIN).link.stdout 2>>$(BIN).link.stderr
-	echo "--"
-	echo "compiler output...."
-	more $(COMPILE_OUT)
-	echo "--"
-	echo "linker output...."
-	more $(BIN).link
+
+#	echo "--"
+#	echo "compiler output...."
+#	more $(COMPILE_OUT)
+#	echo "--"
+#	echo "linker output...."
+#	more $(BIN).link.stderr
+#	more $(BIN).link.stdout
 
 .PHONY: install
 install:
diff --git a/Makefile.p690 b/Makefile.p690
index 38aada11..0ae118c1 100644
--- a/Makefile.p690
+++ b/Makefile.p690
@@ -42,23 +42,37 @@ FLG64=-b64
 # -qflttrap=overflow:underflow:zerodivide:invalid:NANQ:enable 
 
 # take -qextchk out for the final compile
-FFLAGS  = -g -O2 -qstrict -Q $(BITS) $(FLG64) -qarch=auto -qtune=auto \
--qmaxmem=-1 \
--qcheck -qwarn64  \
--qfloat=nomaf:nofold:norsqrt:strictnmaf \
--qflttrap=overflow:underflow:zerodivide:invalid:NANQ:enable \
--qsigtrap \
--qhalt=s -qextchk
-
+# -O2 -qstrict
+# FFLAGS  = -g -O0 -Q $(BITS) $(FLG64) -qarch=auto -qtune=auto \
+#-qmaxmem=-1 \
+#-qcheck -qwarn64  \
+#-qfloat=nomaf:nofold:norsqrt:strictnmaf \
+#-qflttrap=overflow:underflow:zerodivide:invalid:NANQ:enable \
+#-qsigtrap \
+#-qhalt=e
+# -qextchk
 
 # Define C compiler flags.............................
 #
 # take -qextchk out for the final compile
-CFLAGS  = -g -O2 -qstrict -Q $(BITS) $(FLG64) -qarch=auto -qtune=auto \
--qcheck -qwarn64 \
+#CFLAGS  = -g -O2 -qstrict -Q $(BITS) $(FLG64) -qarch=auto -qtune=auto \
+#-qcheck -qwarn64 \
+#-qfloat=nomaf:nofold:norsqrt \
+#-qflttrap=overflow:underflow:zerodivide:invalid:enable \
+#-qhalt=e
+
+# -qextchk
+
+# full speed ahead and damn the torpedos..................
+#
+FFLAGS  = -O2 -qstrict -Q $(BITS) $(FLG64) -qarch=auto -qtune=auto \
+-qmaxmem=-1 \
+-qfloat=nomaf:nofold:norsqrt:strictnmaf \
+-qhalt=e
+CFLAGS  = -O2 -qstrict -Q $(BITS) $(FLG64) -qarch=auto -qtune=auto \
 -qfloat=nomaf:nofold:norsqrt \
--qflttrap=overflow:underflow:zerodivide:invalid:enable \
--qhalt=e -qextchk
+-qhalt=e
+
 
 # compile rules.......................................
 #
diff --git a/NN/Makefile b/NN/Makefile
index 8a75ca85..18fc7e72 100644
--- a/NN/Makefile
+++ b/NN/Makefile
@@ -10,15 +10,18 @@ all: $(LIBFILE_f) $(LIBFILE_c)
 $(LIBFILE_f): $(OBJECTS_NN_f)
 	$(AR) -rv $(LIBFILE_f) $(OBJECTS_NN_f) >$(LIBFILE_f).ar
 	mv -f $(COMPILE_OUT) $(COMPILE_OUT)_f
-	echo "--"
-	echo "compiler output...."
-	more $(COMPILE_OUT)_f
+
+#	echo "--"
+#	echo "compiler output...."
+#	more $(COMPILE_OUT)_f
+
 $(LIBFILE_c): $(OBJECTS_NN_c)
 	$(AR) -rv $(LIBFILE_c) $(OBJECTS_NN_c) >$(LIBFILE_c).ar
 	mv -f $(COMPILE_OUT) $(COMPILE_OUT)_c
-	echo "--"
-	echo "compiler output...."
-	more $(COMPILE_OUT)_c
+
+#	echo "--"
+#	echo "compiler output...."
+#	more $(COMPILE_OUT)_c
 
 .PHONY: objclean
 objclean:
diff --git a/OCTREE/Makefile b/OCTREE/Makefile
index 30f85da8..2348d3a6 100644
--- a/OCTREE/Makefile
+++ b/OCTREE/Makefile
@@ -16,9 +16,10 @@ rootls_sloan.o
 all: $(LIBFILE)
 $(LIBFILE): $(OBJECTS_OCTREE)
 	$(AR) -rv $(LIBFILE) $(OBJECTS_OCTREE) >$(LIBFILE).ar
-	echo "--"
-	echo "compiler output...."
-	more $(COMPILE_OUT)
+
+#	echo "--"
+#	echo "compiler output...."
+#	more $(COMPILE_OUT)
 
 .PHONY: objclean
 objclean:
diff --git a/RESAMPLE/Makefile b/RESAMPLE/Makefile
index ee403f92..0662ab2e 100644
--- a/RESAMPLE/Makefile
+++ b/RESAMPLE/Makefile
@@ -20,9 +20,10 @@ resample.o
 all: $(LIBFILE)
 $(LIBFILE): $(OBJECTS)
 	$(AR) -rv $(LIBFILE) $(OBJECTS) >$(LIBFILE).ar
-	echo "--"
-	echo "compiler output...."
-	more $(COMPILE_OUT)
+
+#	echo "--"
+#	echo "compiler output...."
+#	more $(COMPILE_OUT)
 
 .PHONY: objclean
 objclean:
diff --git a/flush.f b/flush.f
index 91b71979..dce6c5d4 100644
--- a/flush.f
+++ b/flush.f
@@ -7,7 +7,7 @@ c     Author: Douglas Guptill
 c     2009-05-23: new
 
       integer unit
-c      call flush_(unit)
+      call flush_(unit)
       return
       end
 
-- 
GitLab