[cig-commits] r8281 - in mc/3D/CitcomS/branches/v3.0: . module/Exchanger

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-11-12 14:50:32 -0800 (Mon, 12 Nov 2007)
New Revision: 8281

Modified:
   mc/3D/CitcomS/branches/v3.0/
   mc/3D/CitcomS/branches/v3.0/NEWS
   mc/3D/CitcomS/branches/v3.0/configure.ac
   mc/3D/CitcomS/branches/v3.0/module/Exchanger/Makefile.am
Log:
Merged revisions 8173-8193,8198,8200,8203,8208-8211,8216-8225,8229-8234,8238-8240,8246-8274,8276-8280 via svnmerge from 
svn+ssh://svn@geodynamics.org/cig/mc/3D/CitcomS/trunk

........
  r8278 | tan2 | 2007-11-12 14:38:36 -0800 (Mon, 12 Nov 2007) | 1 line
  
  Added mishing header file to the makefile, also avoided compiling unused code.
........
  r8279 | tan2 | 2007-11-12 14:42:56 -0800 (Mon, 12 Nov 2007) | 1 line
  
  Updated the version number and file NEWS
........



Property changes on: mc/3D/CitcomS/branches/v3.0
___________________________________________________________________
Name: svnmerge-integrated
   - /mc/3D/CitcomS/trunk:1-8172,8194-8245
   + /mc/3D/CitcomS/trunk:1-8274,8276-8280

Modified: mc/3D/CitcomS/branches/v3.0/NEWS
===================================================================
--- mc/3D/CitcomS/branches/v3.0/NEWS	2007-11-12 22:49:46 UTC (rev 8280)
+++ mc/3D/CitcomS/branches/v3.0/NEWS	2007-11-12 22:50:32 UTC (rev 8281)
@@ -2,6 +2,11 @@
 
 Please send CitcomS.py bug reports to cig-mc at geodynamics.org.
 
+Version 3.0.1
+
+* A header file for the exchanger was missing in v3.0.0.
+
+
 Version 3.0.0
 
 This release of CitcomS (3.0) contains many new features, including:

Modified: mc/3D/CitcomS/branches/v3.0/configure.ac
===================================================================
--- mc/3D/CitcomS/branches/v3.0/configure.ac	2007-11-12 22:49:46 UTC (rev 8280)
+++ mc/3D/CitcomS/branches/v3.0/configure.ac	2007-11-12 22:50:32 UTC (rev 8281)
@@ -25,7 +25,7 @@
 # $Id$
 
 AC_PREREQ(2.59)
-AC_INIT([CitcomS], [3.0.0], [cig-mc at geodynamics.org], [CitcomS])
+AC_INIT([CitcomS], [3.0.1], [cig-mc at geodynamics.org], [CitcomS])
 AC_CONFIG_AUX_DIR([./aux-config])
 AC_CONFIG_SRCDIR([bin/Citcom.c])
 AC_CONFIG_HEADER([config.h])

Modified: mc/3D/CitcomS/branches/v3.0/module/Exchanger/Makefile.am
===================================================================
--- mc/3D/CitcomS/branches/v3.0/module/Exchanger/Makefile.am	2007-11-12 22:49:46 UTC (rev 8280)
+++ mc/3D/CitcomS/branches/v3.0/module/Exchanger/Makefile.am	2007-11-12 22:50:32 UTC (rev 8281)
@@ -52,8 +52,6 @@
 	$(MPIINCLUDES)
 
 sources = \
-	AreaWeightedNormal.cc \
-	AreaWeightedNormal.h \
 	bindings.cc \
 	bindings.h \
 	Boundary.cc \
@@ -67,6 +65,7 @@
 	exceptions.cc \
 	exceptions.h \
 	Exchangermodule.cc \
+	Exchangermodule.h \
 	exchangers.cc \
 	exchangers.h \
 	global_bbox.cc \
@@ -98,6 +97,8 @@
 	VTOutlet.cc \
 	VTOutlet.h
 EXTRA_DIST = \
+	AreaWeightedNormal.cc \
+	AreaWeightedNormal.h \
 	BoundaryVTInlet.cc \
 	BoundaryVTInlet.h