[cig-commits] r7700 - mc/3D/CitcomS/trunk/bin

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-07-18 14:01:09 -0700 (Wed, 18 Jul 2007)
New Revision: 7700

Removed:
   mc/3D/CitcomS/trunk/bin/coupledcitcoms.in
Modified:
   mc/3D/CitcomS/trunk/bin/Makefile.am
   mc/3D/CitcomS/trunk/bin/citcoms.in
Log:
Unify bin/citcoms with bin/coupledcitcoms scripts. Users can run 'bin/citcoms --coupled' to launch a coupled run and 'bin/citcoms --multicoupled' to launch a multicoupled run.

Modified: mc/3D/CitcomS/trunk/bin/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/bin/Makefile.am	2007-07-18 20:57:41 UTC (rev 7699)
+++ mc/3D/CitcomS/trunk/bin/Makefile.am	2007-07-18 21:01:09 UTC (rev 7700)
@@ -41,7 +41,6 @@
 endif
 if COND_EXCHANGER
     PYLINK = $(CXXLINK)
-    bin_SCRIPTS += coupledcitcoms
     MAYBE_WITH_EXCHANGER = -DWITH_EXCHANGER
 if COND_EMBEDDING
     MAYBE_EXCHANGER_MODULE = $(top_builddir)/module/Exchanger/libExchangerLibmodule.a
@@ -103,9 +102,6 @@
 citcoms: $(srcdir)/citcoms.in Makefile
 	$(do_build) < $(srcdir)/citcoms.in > $@ || (rm -f $@ && exit 1)
 	chmod +x $@
-coupledcitcoms: $(srcdir)/coupledcitcoms.in Makefile
-	$(do_build) < $(srcdir)/coupledcitcoms.in > $@ || (rm -f $@ && exit 1)
-	chmod +x $@
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@@ -119,7 +115,7 @@
 	    chmod +x "$(DESTDIR)$(bindir)/$$f"; \
 	  else :; fi; \
 	done
-EXTRA_DIST = citcoms.in coupledcitcoms.in
+EXTRA_DIST = citcoms.in
 CLEANFILES = $(bin_SCRIPTS)
 
 

Modified: mc/3D/CitcomS/trunk/bin/citcoms.in
===================================================================
--- mc/3D/CitcomS/trunk/bin/citcoms.in	2007-07-18 20:57:41 UTC (rev 7699)
+++ mc/3D/CitcomS/trunk/bin/citcoms.in	2007-07-18 21:01:09 UTC (rev 7700)
@@ -39,8 +39,33 @@
         sys.path.insert(1, directory)
         site.addsitedir(directory)
 
-from CitcomS.SimpleApp import SimpleApp
+
+# Decide which application to run. The default is the single-solver (uncoupled)
+# application, which is right choice in most situaction.
+#
+# If the first command line argument is '--coupled' or '--multicoupled',
+# a different application (for coupled models) will be used. In this case, the
+# first command line argument will be removed, so it won't be interpreted as
+# an input parameter by the application.
+
+if len(sys.argv) < 2:
+    # no command line argument, use SimpleApp, a single solver application
+    from CitcomS.SimpleApp import SimpleApp as App
+elif sys.argv[1] == '--coupled':
+    # a dual solver application
+    from CitcomS.CoupledApp import CoupledApp as App
+    del sys.argv[1]
+elif sys.argv[1] == '--multicoupled':
+    # a triple solver application
+    from CitcomS.MultiCoupledApp import MultiCoupledApp as App
+    del sys.argv[1]
+else:
+    # use SimpleApp by default
+    from CitcomS.SimpleApp import SimpleApp as App
+
+
+# start the application
 from pyre.applications import start
-start(applicationClass=SimpleApp)
+start(applicationClass=App)
 
-#  end of file 
+#  end of file

Deleted: mc/3D/CitcomS/trunk/bin/coupledcitcoms.in
===================================================================
--- mc/3D/CitcomS/trunk/bin/coupledcitcoms.in	2007-07-18 20:57:41 UTC (rev 7699)
+++ mc/3D/CitcomS/trunk/bin/coupledcitcoms.in	2007-07-18 21:01:09 UTC (rev 7700)
@@ -1,46 +0,0 @@
-#!@INTERPRETER@
-# -*- Python -*-
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#<LicenseText>
-#
-# CitcomS.py by Eh Tan, Eun-seo Choi, and Pururav Thoutireddy.
-# Copyright (C) 2002-2005, California Institute of Technology.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-#</LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-__requires__ = "CitcomS"
-
-# re-create the PYTHONPATH at 'configure' time
-import os.path, sys, site
-path = '@PYTHONPATH@'.split(':')
-path.reverse()
-for directory in path:
-    if directory:
-        directory = os.path.abspath(directory)
-        sys.path.insert(1, directory)
-        site.addsitedir(directory)
-
-from CitcomS.CoupledApp import CoupledApp
-from pyre.applications import start
-start(applicationClass=CoupledApp)
-
-#  end of file