[cig-commits] r3983 - in mc/3D/CitcomS/trunk: CitcomS
CitcomS/Components CitcomS/Components/Advection_diffusion
CitcomS/Components/Exchanger CitcomS/Components/Sphere
CitcomS/Components/Stokes_solver CitcomS/Solver bin module
module/Exchanger tests
leif at geodynamics.org
leif at geodynamics.org
Fri Jul 7 15:35:14 PDT 2006
Author: leif
Date: 2006-07-07 15:35:14 -0700 (Fri, 07 Jul 2006)
New Revision: 3983
Added:
mc/3D/CitcomS/trunk/module/Regionalmodule.cc
mc/3D/CitcomS/trunk/module/advdiffu.cc
mc/3D/CitcomS/trunk/module/advdiffu.h
mc/3D/CitcomS/trunk/module/bindings.cc
mc/3D/CitcomS/trunk/module/bindings.h
mc/3D/CitcomS/trunk/module/exceptions.cc
mc/3D/CitcomS/trunk/module/exceptions.h
mc/3D/CitcomS/trunk/module/initial_conditions.cc
mc/3D/CitcomS/trunk/module/initial_conditions.h
mc/3D/CitcomS/trunk/module/mesher.cc
mc/3D/CitcomS/trunk/module/mesher.h
mc/3D/CitcomS/trunk/module/misc.cc
mc/3D/CitcomS/trunk/module/misc.h
mc/3D/CitcomS/trunk/module/outputs.cc
mc/3D/CitcomS/trunk/module/outputs.h
mc/3D/CitcomS/trunk/module/setProperties.cc
mc/3D/CitcomS/trunk/module/setProperties.h
mc/3D/CitcomS/trunk/module/stokes_solver.cc
mc/3D/CitcomS/trunk/module/stokes_solver.h
Removed:
mc/3D/CitcomS/trunk/module/Full/
mc/3D/CitcomS/trunk/module/Regional/
Modified:
mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py
mc/3D/CitcomS/trunk/CitcomS/Components/BC.py
mc/3D/CitcomS/trunk/CitcomS/Components/Const.py
mc/3D/CitcomS/trunk/CitcomS/Components/Exchanger/Exchanger.py
mc/3D/CitcomS/trunk/CitcomS/Components/Exchanger/Inlet.py
mc/3D/CitcomS/trunk/CitcomS/Components/Exchanger/Outlet.py
mc/3D/CitcomS/trunk/CitcomS/Components/IC.py
mc/3D/CitcomS/trunk/CitcomS/Components/Param.py
mc/3D/CitcomS/trunk/CitcomS/Components/Phase.py
mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/FullSphere.py
mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/RegionalSphere.py
mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/Sphere.py
mc/3D/CitcomS/trunk/CitcomS/Components/Stokes_solver/Incompressible.py
mc/3D/CitcomS/trunk/CitcomS/Components/Tracer.py
mc/3D/CitcomS/trunk/CitcomS/Components/Visc.py
mc/3D/CitcomS/trunk/CitcomS/Makefile.am
mc/3D/CitcomS/trunk/CitcomS/SimpleApp.py
mc/3D/CitcomS/trunk/CitcomS/Solver/FullSolver.py
mc/3D/CitcomS/trunk/CitcomS/Solver/RegionalSolver.py
mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py
mc/3D/CitcomS/trunk/bin/Makefile.am
mc/3D/CitcomS/trunk/bin/citcoms.in
mc/3D/CitcomS/trunk/bin/pycitcoms.cc
mc/3D/CitcomS/trunk/module/CitcomSmodule.cc
mc/3D/CitcomS/trunk/module/CitcomSmodule.h
mc/3D/CitcomS/trunk/module/Exchanger/Exchangermodule.cc
mc/3D/CitcomS/trunk/module/Exchanger/Exchangermodule.h
mc/3D/CitcomS/trunk/module/Exchanger/Makefile.am
mc/3D/CitcomS/trunk/module/Makefile.am
mc/3D/CitcomS/trunk/tests/exchange.py
Log:
Moved & renamed extension modules:
CitcomS.CitcomS -> CitcomsLib
CitcomS.Exchanger -> ExchangerLib
Top-level modules allow easy toggling between embedding &
extending without any special hacks in the embedding case.
Also, it allows the Python scripts to be installed under
'libdir' instead of 'libexecdir', although this is a minor
issue.
Also: moved module/Regional/* source to module/* to really
complete the Full/Regional merge (there is only one CitcomS
extension module now). Plus, a bug fix in collectUserInput.
Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -46,7 +46,7 @@
def setProperties(self):
- from CitcomS.CitcomS import Advection_diffusion_set_properties
+ from CitcomSLib import Advection_diffusion_set_properties
Advection_diffusion_set_properties(self.all_variables, self.inventory)
return
@@ -59,14 +59,14 @@
def setup(self):
- from CitcomS.CitcomS import set_convection_defaults
+ from CitcomSLib import set_convection_defaults
set_convection_defaults(self.all_variables)
self._been_here = False
return
def launch(self):
- from CitcomS.CitcomS import PG_timestep_init
+ from CitcomSLib import PG_timestep_init
PG_timestep_init(self.all_variables)
return
@@ -76,14 +76,14 @@
def _solve(self,dt):
- from CitcomS.CitcomS import PG_timestep_solve
+ from CitcomSLib import PG_timestep_solve
PG_timestep_solve(self.all_variables, dt)
return
def stable_timestep(self):
- from CitcomS.CitcomS import stable_timestep
+ from CitcomSLib import stable_timestep
dt = stable_timestep(self.all_variables)
return dt
Modified: mc/3D/CitcomS/trunk/CitcomS/Components/BC.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/BC.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/BC.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -38,14 +38,14 @@
def setProperties(self):
- from CitcomS.CitcomS import BC_set_properties
+ from CitcomSLib import BC_set_properties
BC_set_properties(self.all_variables, self.inventory)
return
def updatePlateVelocity(self):
- from CitcomS.CitcomS import BC_update_plate_velocity
+ from CitcomSLib import BC_update_plate_velocity
BC_update_plate_velocity(self.all_variables)
return
Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Const.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Const.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Const.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -39,7 +39,7 @@
def setProperties(self):
- from CitcomS.CitcomS import Const_set_properties
+ from CitcomSLib import Const_set_properties
Const_set_properties(self.all_variables, self.inventory)
return
Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Exchanger/Exchanger.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Exchanger/Exchanger.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Exchanger/Exchanger.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -74,8 +74,8 @@
def selectModule(self):
- import CitcomS.Exchanger
- self.module = CitcomS.Exchanger
+ import ExchangerLib
+ self.module = ExchangerLib
return
Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Exchanger/Inlet.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Exchanger/Inlet.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Exchanger/Inlet.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -36,20 +36,20 @@
def impose(self):
- import CitcomS.Exchanger as Exchanger
- Exchanger.Inlet_impose(self._handle)
+ import ExchangerLib
+ ExchangerLib.Inlet_impose(self._handle)
return
def recv(self):
- import CitcomS.Exchanger as Exchanger
- Exchanger.Inlet_recv(self._handle)
+ import ExchangerLib
+ ExchangerLib.Inlet_recv(self._handle)
return
def storeTimestep(self, fge_t, cge_t):
- import CitcomS.Exchanger as Exchanger
- Exchanger.Inlet_storeTimestep(self._handle, fge_t, cge_t)
+ import ExchangerLib
+ ExchangerLib.Inlet_storeTimestep(self._handle, fge_t, cge_t)
return
@@ -58,10 +58,10 @@
class SVTInlet(Inlet):
def __init__(self, mesh, sink, all_variables):
- import CitcomS.Exchanger as Exchanger
- self._handle = Exchanger.SVTInlet_create(mesh,
- sink,
- all_variables)
+ import ExchangerLib
+ self._handle = ExchangerLib.SVTInlet_create(mesh,
+ sink,
+ all_variables)
return
@@ -69,32 +69,32 @@
class TInlet(Inlet):
- def __init__(self, mesh, sink, all_variables):
- import CitcomS.Exchanger as Exchanger
- self._handle = Exchanger.TInlet_create(mesh,
- sink,
- all_variables)
- return
+ def __init__(self, mesh, sink, all_variables):
+ import ExchangerLib
+ self._handle = ExchangerLib.TInlet_create(mesh,
+ sink,
+ all_variables)
+ return
class SInlet(Inlet):
- def __init__(self, mesh, sink, all_variables):
- import CitcomS.Exchanger as Exchanger
- self._handle = Exchanger.SInlet_create(mesh,
- sink,
- all_variables)
- return
+ def __init__(self, mesh, sink, all_variables):
+ import ExchangerLib
+ self._handle = ExchangerLib.SInlet_create(mesh,
+ sink,
+ all_variables)
+ return
class VTInlet(Inlet):
- def __init__(self, mesh, sink, all_variables):
- import CitcomS.Exchanger as Exchanger
- self._handle = Exchanger.VTInlet_create(mesh,
- sink,
- all_variables)
- return
+ def __init__(self, mesh, sink, all_variables):
+ import ExchangerLib
+ self._handle = ExchangerLib.VTInlet_create(mesh,
+ sink,
+ all_variables)
+ return
@@ -105,12 +105,12 @@
def __init__(self, communicator, boundary, sink, all_variables, mode="VT"):
- import CitcomS.Exchanger as Exchanger
- self._handle = Exchanger.BoundaryVTInlet_create(communicator.handle(),
- boundary,
- sink,
- all_variables,
- mode)
+ import ExchangerLib
+ self._handle = ExchangerLib.BoundaryVTInlet_create(communicator.handle(),
+ boundary,
+ sink,
+ all_variables,
+ mode)
return
@@ -125,11 +125,11 @@
'''
def __init__(self, boundary, sink, all_variables, mode='F'):
- import CitcomS.Exchanger as Exchanger
- self._handle = Exchanger.TractionInlet_create(boundary,
- sink,
- all_variables,
- mode)
+ import ExchangerLib
+ self._handle = ExchangerLib.TractionInlet_create(boundary,
+ sink,
+ all_variables,
+ mode)
return
"""
Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Exchanger/Outlet.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Exchanger/Outlet.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Exchanger/Outlet.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -36,8 +36,8 @@
def send(self):
- import CitcomS.Exchanger as Exchanger
- Exchanger.Outlet_send(self._handle)
+ import ExchangerLib
+ ExchangerLib.Outlet_send(self._handle)
return
@@ -47,9 +47,9 @@
class SVTOutlet(Outlet):
def __init__(self, source, all_variables):
- import CitcomS.Exchanger as Exchanger
- self._handle = Exchanger.SVTOutlet_create(source,
- all_variables)
+ import ExchangerLib
+ self._handle = ExchangerLib.SVTOutlet_create(source,
+ all_variables)
return
@@ -58,9 +58,9 @@
class TOutlet(Outlet):
def __init__(self, source, all_variables):
- import CitcomS.Exchanger as Exchanger
- self._handle = Exchanger.TOutlet_create(source,
- all_variables)
+ import ExchangerLib
+ self._handle = ExchangerLib.TOutlet_create(source,
+ all_variables)
return
@@ -69,18 +69,18 @@
class VTOutlet(Outlet):
def __init__(self, source, all_variables):
- import CitcomS.Exchanger as Exchanger
- self._handle = Exchanger.VTOutlet_create(source,
- all_variables)
+ import ExchangerLib
+ self._handle = ExchangerLib.VTOutlet_create(source,
+ all_variables)
return
class VOutlet(Outlet):
def __init__(self, source, all_variables):
- import CitcomS.Exchanger as Exchanger
- self._handle = Exchanger.VOutlet_create(source,
- all_variables)
+ import ExchangerLib
+ self._handle = ExchangerLib.VOutlet_create(source,
+ all_variables)
return
@@ -89,10 +89,10 @@
def __init__(self, source, all_variables, mode='F'):
- import CitcomS.Exchanger as Exchanger
- self._handle = Exchanger.TractionOutlet_create(source,
- all_variables,
- mode)
+ import ExchangerLib
+ self._handle = ExchangerLib.TractionOutlet_create(source,
+ all_variables,
+ mode)
return
"""
Modified: mc/3D/CitcomS/trunk/CitcomS/Components/IC.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/IC.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/IC.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -39,7 +39,7 @@
def setProperties(self):
- from CitcomS.CitcomS import IC_set_properties
+ from CitcomSLib import IC_set_properties
inv = self.inventory
inv.perturbmag = map(float, inv.perturbmag)
@@ -63,7 +63,7 @@
def initTemperature(self):
- from CitcomS.CitcomS import constructTemperature, restartTemperature
+ from CitcomSLib import constructTemperature, restartTemperature
if self.inventory.restart:
restartTemperature(self.all_variables)
else:
@@ -73,21 +73,21 @@
def initPressure(self):
- from CitcomS.CitcomS import initPressure
+ from CitcomSLib import initPressure
initPressure(self.all_variables)
return
def initVelocity(self):
- from CitcomS.CitcomS import initVelocity
+ from CitcomSLib import initVelocity
initVelocity(self.all_variables)
return
def initViscosity(self):
- from CitcomS.CitcomS import initViscosity
+ from CitcomSLib import initViscosity
initViscosity(self.all_variables)
return
Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Param.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Param.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Param.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -38,7 +38,7 @@
def setProperties(self):
- from CitcomS.CitcomS import Param_set_properties
+ from CitcomSLib import Param_set_properties
Param_set_properties(self.all_variables, self.inventory)
return
Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Phase.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Phase.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Phase.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -38,7 +38,7 @@
def setProperties(self):
- from CitcomS.CitcomS import Phase_set_properties
+ from CitcomSLib import Phase_set_properties
Phase_set_properties(self.all_variables, self.inventory)
return
Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/FullSphere.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/FullSphere.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/FullSphere.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -39,7 +39,7 @@
def launch(self):
- from CitcomS.CitcomS import full_sphere_launch
+ from CitcomSLib import full_sphere_launch
full_sphere_launch(self.all_variables)
return
Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/RegionalSphere.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/RegionalSphere.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/RegionalSphere.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -39,7 +39,7 @@
def launch(self):
- from CitcomS.CitcomS import regional_sphere_launch
+ from CitcomSLib import regional_sphere_launch
regional_sphere_launch(self.all_variables)
return
Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/Sphere.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/Sphere.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/Sphere.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -26,7 +26,7 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
-from CitcomS.CitcomS import CPU_time
+from CitcomSLib import CPU_time
from CitcomS.Components.CitcomComponent import CitcomComponent
class Sphere(CitcomComponent):
@@ -59,7 +59,7 @@
def setProperties(self):
- from CitcomS.CitcomS import Sphere_set_properties
+ from CitcomSLib import Sphere_set_properties
Sphere_set_properties(self.all_variables, self.inventory)
return
Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Stokes_solver/Incompressible.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Stokes_solver/Incompressible.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Stokes_solver/Incompressible.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -40,14 +40,14 @@
def run(self):
- from CitcomS.CitcomS import general_stokes_solver
+ from CitcomSLib import general_stokes_solver
general_stokes_solver(self.all_variables)
return
def setup(self):
- from CitcomS.CitcomS import set_cg_defaults, set_mg_defaults, set_mg_el_defaults
+ from CitcomSLib import set_cg_defaults, set_mg_defaults, set_mg_el_defaults
if self.inventory.Solver == "cgrad":
set_cg_defaults(self.all_variables)
elif self.inventory.Solver == "multigrid":
@@ -59,7 +59,7 @@
def launch(self):
- from CitcomS.CitcomS import general_stokes_solver_setup
+ from CitcomSLib import general_stokes_solver_setup
general_stokes_solver_setup(self.all_variables)
return
@@ -71,7 +71,7 @@
def setProperties(self):
- from CitcomS.CitcomS import Incompressible_set_properties
+ from CitcomSLib import Incompressible_set_properties
Incompressible_set_properties(self.all_variables, self.inventory)
return
Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Tracer.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Tracer.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Tracer.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -39,14 +39,14 @@
def run(self):
- from CitcomS.CitcomS import Tracer_tracer_advection
+ from CitcomSLib import Tracer_tracer_advection
Tracer_tracer_advection(self.all_variables)
return
def setProperties(self):
- from CitcomS.CitcomS import Tracer_set_properties
+ from CitcomSLib import Tracer_set_properties
Tracer_set_properties(self.all_variables, self.inventory)
return
Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Visc.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Visc.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Visc.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -42,7 +42,7 @@
def setProperties(self):
- from CitcomS.CitcomS import Visc_set_properties
+ from CitcomSLib import Visc_set_properties
inv = self.inventory
inv.visc0 = map(float, inv.visc0)
@@ -58,7 +58,7 @@
def updateMaterial(self):
- from CitcomS.CitcomS import Visc_update_material
+ from CitcomSLib import Visc_update_material
Visc_update_material(self.all_variables)
return
Modified: mc/3D/CitcomS/trunk/CitcomS/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Makefile.am 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/Makefile.am 2006-07-07 22:35:14 UTC (rev 3983)
@@ -23,7 +23,7 @@
# $Id$
-nobase_pkgpyexec_PYTHON = \
+nobase_pkgpython_PYTHON = \
__init__.py \
Components/Advection_diffusion/Advection_diffusion.py \
Components/Advection_diffusion/__init__.py \
@@ -61,10 +61,10 @@
Solver/RegionalSolver.py \
Solver/Solver.py
-nodist_pkgpyexec_PYTHON = \
+nodist_pkgpython_PYTHON = \
config.py
config.py: $(top_builddir)/portinfo $(top_builddir)/Makefile
$(PYCONFIG) -h $(top_builddir)/portinfo -m $(top_builddir)/Makefile -o $@
-CLEANFILES = $(nodist_pkgpyexec_PYTHON)
+CLEANFILES = $(nodist_pkgpython_PYTHON)
## end of Makefile.am
Modified: mc/3D/CitcomS/trunk/CitcomS/SimpleApp.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/SimpleApp.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/SimpleApp.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -152,6 +152,8 @@
def collectUserInput(self, registry):
# read INI-style .cfg files
+ import journal
+ error = journal.error(self.name)
from Components.CodecConfig import CodecConfig
curator = self.getCurator()
configRegistry = curator.getTraits(self.name, extraDepositories=[], encoding='cfg')
@@ -169,9 +171,9 @@
if paramRegistry:
self.updateConfiguration(paramRegistry)
else:
- self.error.log("unknown encoding: %s" % ext)
+ error.log("unknown encoding: %s" % ext)
else:
- self.error.log("cannot open '%s'" % arg)
+ error.log("cannot open '%s'" % arg)
return
Modified: mc/3D/CitcomS/trunk/CitcomS/Solver/FullSolver.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Solver/FullSolver.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/Solver/FullSolver.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -27,7 +27,6 @@
#
from Solver import Solver
-from CitcomS.CitcomS import full_solver_init
import journal
@@ -35,6 +34,7 @@
def initializeSolver(self):
+ from CitcomSLib import full_solver_init
full_solver_init(self.all_variables)
Modified: mc/3D/CitcomS/trunk/CitcomS/Solver/RegionalSolver.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Solver/RegionalSolver.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/Solver/RegionalSolver.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -27,7 +27,7 @@
#
from Solver import Solver
-from CitcomS.CitcomS import regional_solver_init
+from CitcomSLib import regional_solver_init
import journal
Modified: mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -26,7 +26,7 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
-from CitcomS.CitcomS import CPU_time, output
+from CitcomSLib import CPU_time, output
from pyre.simulations.Solver import Solver as BaseSolver
import journal
@@ -54,7 +54,7 @@
def initialize(self, application):
- from CitcomS.CitcomS import citcom_init, global_default_values, set_signal
+ from CitcomSLib import citcom_init, global_default_values, set_signal
BaseSolver.initialize(self, application)
@@ -275,7 +275,7 @@
def setProperties(self):
- from CitcomS.CitcomS import Solver_set_properties
+ from CitcomSLib import Solver_set_properties
Solver_set_properties(self.all_variables, self.inventory)
Modified: mc/3D/CitcomS/trunk/bin/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/bin/Makefile.am 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/bin/Makefile.am 2006-07-07 22:35:14 UTC (rev 3983)
@@ -30,16 +30,17 @@
if COND_PYRE
noinst_SCRIPTS += citcoms
-noinstPYTHONPATH = $$top_srcdir
if COND_EMBEDDING
bin_PROGRAMS += pycitcoms
INTERPRETER = $(bindir)/pycitcoms
noinstINTERPRETER = $$here/pycitcoms
+ noinstPYTHONPATH = $$top_srcdir
libCitcomS = $(top_builddir)/lib/libCitcomS.a
else
INTERPRETER = $(PYTHON)
noinstINTERPRETER = $(PYTHON)
+ noinstPYTHONPATH = $$top_srcdir:$$top_srcdir/module/.libs:$$top_srcdir/module/Exchanger/.libs
libCitcomS = $(top_builddir)/lib/libCitcomS.la
endif
@@ -67,7 +68,7 @@
CitcomSRegional_LDADD = $(libCitcomS) $(MPILIBS) $(LIBM)
# citcoms (top-level Python script)
-citcoms: $(srcdir)/citcoms.in
+citcoms: $(srcdir)/citcoms.in Makefile
here=`pwd`; \
top_srcdir=`cd $(top_srcdir) && pwd`; \
sed \
@@ -85,13 +86,13 @@
CLEANFILES = $(noinst_SCRIPTS)
EXTRA_DIST = citcoms.in
-# pycitcoms (libCitcomS + CitcomSmodule + libExchanger +
-# Exchangermodule + embedded Python interpreter)
+# pycitcoms (libCitcomS + CitcomSLibmodule + libExchanger +
+# ExchangerLibmodule + embedded Python interpreter)
pycitcoms_SOURCES = pycitcoms.cc
pycitcoms_LDADD = \
$(top_builddir)/module/libPyxMPImodule.a \
- $(top_builddir)/module/Exchanger/libExchangermodule.a \
- $(top_builddir)/module/libCitcomSmodule.a \
+ $(top_builddir)/module/Exchanger/libExchangerLibmodule.a \
+ $(top_builddir)/module/libCitcomSLibmodule.a \
$(libCitcomS) \
$(LIBM)
pycitcoms$(EXEEXT): $(pycitcoms_OBJECTS) $(pycitcoms_DEPENDENCIES)
Modified: mc/3D/CitcomS/trunk/bin/citcoms.in
===================================================================
--- mc/3D/CitcomS/trunk/bin/citcoms.in 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/bin/citcoms.in 2006-07-07 22:35:14 UTC (rev 3983)
@@ -36,15 +36,7 @@
if directory:
sys.path.insert(1, directory)
-try:
- # if we are embedding, insert the extension module in the
- # 'CitcomS' package...
- import builtin_Exchanger, builtin_CitcomS
- sys.modules['CitcomS.Exchanger'] = builtin_Exchanger
- sys.modules['CitcomS.CitcomS'] = builtin_CitcomS
- from PyxMPI import MPI_Init, MPI_Finalize
-except ImportError:
- from CitcomS.PyxMPI import MPI_Init, MPI_Finalize
+from PyxMPI import MPI_Init, MPI_Finalize
inParallel = False
for arg in sys.argv:
Modified: mc/3D/CitcomS/trunk/bin/pycitcoms.cc
===================================================================
--- mc/3D/CitcomS/trunk/bin/pycitcoms.cc 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/bin/pycitcoms.cc 2006-07-07 22:35:14 UTC (rev 3983)
@@ -32,13 +32,11 @@
#include "Exchangermodule.h"
PyMODINIT_FUNC initPyxMPI(void);
-static void init_builtin_Exchanger() { PyCitcomSExchanger_init("builtin_Exchanger"); }
-static void init_builtin_CitcomS() { pyCitcom_init("builtin_CitcomS"); }
struct _inittab inittab[] = {
{ "PyxMPI", initPyxMPI },
- { "builtin_Exchanger", init_builtin_Exchanger },
- { "builtin_CitcomS", init_builtin_CitcomS },
+ { "ExchangerLib", initExchangerLib },
+ { "CitcomSLib", initCitcomSLib },
{ 0, 0 }
};
Modified: mc/3D/CitcomS/trunk/module/CitcomSmodule.cc
===================================================================
--- mc/3D/CitcomS/trunk/module/CitcomSmodule.cc 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/module/CitcomSmodule.cc 2006-07-07 22:35:14 UTC (rev 3983)
@@ -36,11 +36,14 @@
char pyCitcomS_module__doc__[] = "";
-void pyCitcom_init(const char *name)
+// Initialization function for the module (*must* be called initCitcomSLib)
+extern "C"
+void
+initCitcomSLib()
{
// create the module and add the functions
PyObject * m = Py_InitModule4(
- (char *)name, pyCitcom_methods,
+ "CitcomSLib", pyCitcom_methods,
pyCitcomS_module__doc__, 0, PYTHON_API_VERSION);
// get its dictionary
@@ -48,24 +51,16 @@
// check for errors
if (PyErr_Occurred()) {
- Py_FatalError("can't initialize module CitcomS");
+ Py_FatalError("can't initialize module CitcomSLib");
}
// install the module exceptions
- pyCitcom_runtimeError = PyErr_NewException("CitcomS.runtime", 0, 0);
+ pyCitcom_runtimeError = PyErr_NewException("CitcomSLib.runtime", 0, 0);
PyDict_SetItemString(d, "RuntimeException", pyCitcom_runtimeError);
return;
}
-// Initialization function for the module (*must* be called initCitcomS)
-extern "C"
-void
-initCitcomS()
-{
- pyCitcom_init("CitcomS");
-}
-
// version
// $Id$
Modified: mc/3D/CitcomS/trunk/module/CitcomSmodule.h
===================================================================
--- mc/3D/CitcomS/trunk/module/CitcomSmodule.h 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/module/CitcomSmodule.h 2006-07-07 22:35:14 UTC (rev 3983)
@@ -29,7 +29,9 @@
#ifndef pyCitcom_CitcomSmodule_h
#define pyCitcom_CitcomSmodule_h
-void pyCitcom_init(const char *name);
+extern "C"
+void
+initCitcomSLib();
#endif // pyCitcom_CitcomSmodule_h
Modified: mc/3D/CitcomS/trunk/module/Exchanger/Exchangermodule.cc
===================================================================
--- mc/3D/CitcomS/trunk/module/Exchanger/Exchangermodule.cc 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/module/Exchanger/Exchangermodule.cc 2006-07-07 22:35:14 UTC (rev 3983)
@@ -37,11 +37,14 @@
char pyExchanger_module__doc__[] = "";
-void PyCitcomSExchanger_init(const char *name)
+// Initialization function for the module (*must* be called initExchanger)
+extern "C"
+void
+initExchangerLib()
{
// create the module and add the functions
PyObject * m = Py_InitModule4(
- (char *)name, pyExchanger_methods,
+ "ExchangerLib", pyExchanger_methods,
pyExchanger_module__doc__, 0, PYTHON_API_VERSION);
// get its dictionary
@@ -49,24 +52,16 @@
// check for errors
if (PyErr_Occurred()) {
- Py_FatalError("can't initialize module Exchanger");
+ Py_FatalError("can't initialize module ExchangerLib");
}
// install the module exceptions
- pyExchanger_runtimeError = PyErr_NewException("Exchanger.runtime", 0, 0);
+ pyExchanger_runtimeError = PyErr_NewException("ExchangerLib.runtime", 0, 0);
PyDict_SetItemString(d, "RuntimeException", pyExchanger_runtimeError);
return;
}
-// Initialization function for the module (*must* be called initExchanger)
-extern "C"
-void
-initExchanger()
-{
- PyCitcomSExchanger_init("Exchanger");
-}
-
// version
// $Id$
Modified: mc/3D/CitcomS/trunk/module/Exchanger/Exchangermodule.h
===================================================================
--- mc/3D/CitcomS/trunk/module/Exchanger/Exchangermodule.h 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/module/Exchanger/Exchangermodule.h 2006-07-07 22:35:14 UTC (rev 3983)
@@ -29,7 +29,9 @@
#ifndef pyCitcom_Exchangermodule_h
#define pyCitcom_Exchangermodule_h
-void PyCitcomSExchanger_init(const char *name);
+extern "C"
+void
+initExchangerLib();
#endif // pyCitcom_Exchangermodule_h
Modified: mc/3D/CitcomS/trunk/module/Exchanger/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/module/Exchanger/Makefile.am 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/module/Exchanger/Makefile.am 2006-07-07 22:35:14 UTC (rev 3983)
@@ -24,27 +24,27 @@
# $Id$
noinst_LIBRARIES =
-pkgpyexec_LTLIBRARIES =
+pyexec_LTLIBRARIES =
if COND_EMBEDDING
# static library
- noinst_LIBRARIES += libExchangermodule.a
+ noinst_LIBRARIES += libExchangerLibmodule.a
else
# extension module (libtool)
- pkgpyexec_LTLIBRARIES += Exchangermodule.la
+ pyexec_LTLIBRARIES += ExchangerLibmodule.la
endif
# static library
-libExchangermodule_a_CXXFLAGS = $(AM_CXXFLAGS) # hack for automake
-libExchangermodule_a_SOURCES = $(sources)
+libExchangerLibmodule_a_CXXFLAGS = $(AM_CXXFLAGS) # hack for automake
+libExchangerLibmodule_a_SOURCES = $(sources)
# extension module (libtool)
-Exchangermodule_la_LDFLAGS = -module -release $(VERSION)
-Exchangermodule_la_LIBADD = \
+ExchangerLibmodule_la_LDFLAGS = -module -release $(VERSION)
+ExchangerLibmodule_la_LIBADD = \
$(top_builddir)/lib/libCitcomS.la \
-lExchanger \
-l_mpimodule -ljournal
-Exchangermodule_la_SOURCES = $(sources)
+ExchangerLibmodule_la_SOURCES = $(sources)
CXX = $(MPICXX)
CXXLD = @CXX@
Modified: mc/3D/CitcomS/trunk/module/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/module/Makefile.am 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/module/Makefile.am 2006-07-07 22:35:14 UTC (rev 3983)
@@ -26,31 +26,31 @@
SUBDIRS = Exchanger
noinst_LIBRARIES =
-pkgpyexec_LTLIBRARIES =
+pyexec_LTLIBRARIES =
if COND_EMBEDDING
# static library
- noinst_LIBRARIES += libCitcomSmodule.a libPyxMPImodule.a
+ noinst_LIBRARIES += libCitcomSLibmodule.a libPyxMPImodule.a
else
# extension module (libtool)
- pkgpyexec_LTLIBRARIES += CitcomSmodule.la PyxMPImodule.la
+ pyexec_LTLIBRARIES += CitcomSLibmodule.la PyxMPImodule.la
endif
# static libraries
-libCitcomSmodule_a_CXXFLAGS = $(AM_CXXFLAGS) # hack for automake
-libCitcomSmodule_a_SOURCES = $(sources)
+libCitcomSLibmodule_a_CXXFLAGS = $(AM_CXXFLAGS) # hack for automake
+libCitcomSLibmodule_a_SOURCES = $(sources)
libPyxMPImodule_a_CFLAGS = $(AM_CXXFLAGS) # hack for automake
libPyxMPImodule_a_SOURCES = PyxMPI/PyxMPI.c
# extension modules (libtool)
-CitcomSmodule_la_LDFLAGS = -module -release $(VERSION)
-CitcomSmodule_la_LIBADD = \
+CitcomSLibmodule_la_LDFLAGS = -module -release $(VERSION)
+CitcomSLibmodule_la_LIBADD = \
$(top_builddir)/lib/libCitcomS.la \
-l_mpimodule -ljournal $(MPILIBS)
-CitcomSmodule_la_SOURCES = $(sources)
+CitcomSLibmodule_la_SOURCES = $(sources)
PyxMPImodule_la_LDFLAGS = -module -release $(VERSION)
PyxMPImodule_la_LIBADD =
@@ -70,23 +70,23 @@
sources = \
CitcomSmodule.cc \
- Regional/advdiffu.cc \
- Regional/advdiffu.h \
- Regional/bindings.cc \
- Regional/bindings.h \
- Regional/exceptions.cc \
- Regional/exceptions.h \
- Regional/initial_conditions.cc \
- Regional/initial_conditions.h \
- Regional/mesher.cc \
- Regional/mesher.h \
- Regional/misc.cc \
- Regional/misc.h \
- Regional/outputs.cc \
- Regional/outputs.h \
- Regional/setProperties.cc \
- Regional/setProperties.h \
- Regional/stokes_solver.cc \
- Regional/stokes_solver.h
+ advdiffu.cc \
+ advdiffu.h \
+ bindings.cc \
+ bindings.h \
+ exceptions.cc \
+ exceptions.h \
+ initial_conditions.cc \
+ initial_conditions.h \
+ mesher.cc \
+ mesher.h \
+ misc.cc \
+ misc.h \
+ outputs.cc \
+ outputs.h \
+ setProperties.cc \
+ setProperties.h \
+ stokes_solver.cc \
+ stokes_solver.h
## end of Makefile.am
Copied: mc/3D/CitcomS/trunk/module/Regionalmodule.cc (from rev 3979, mc/3D/CitcomS/trunk/module/Regional/Regionalmodule.cc)
Copied: mc/3D/CitcomS/trunk/module/advdiffu.cc (from rev 3979, mc/3D/CitcomS/trunk/module/Regional/advdiffu.cc)
Copied: mc/3D/CitcomS/trunk/module/advdiffu.h (from rev 3979, mc/3D/CitcomS/trunk/module/Regional/advdiffu.h)
Copied: mc/3D/CitcomS/trunk/module/bindings.cc (from rev 3982, mc/3D/CitcomS/trunk/module/Regional/bindings.cc)
Copied: mc/3D/CitcomS/trunk/module/bindings.h (from rev 3979, mc/3D/CitcomS/trunk/module/Regional/bindings.h)
Copied: mc/3D/CitcomS/trunk/module/exceptions.cc (from rev 3979, mc/3D/CitcomS/trunk/module/Regional/exceptions.cc)
Copied: mc/3D/CitcomS/trunk/module/exceptions.h (from rev 3979, mc/3D/CitcomS/trunk/module/Regional/exceptions.h)
Copied: mc/3D/CitcomS/trunk/module/initial_conditions.cc (from rev 3979, mc/3D/CitcomS/trunk/module/Regional/initial_conditions.cc)
Copied: mc/3D/CitcomS/trunk/module/initial_conditions.h (from rev 3979, mc/3D/CitcomS/trunk/module/Regional/initial_conditions.h)
Copied: mc/3D/CitcomS/trunk/module/mesher.cc (from rev 3979, mc/3D/CitcomS/trunk/module/Regional/mesher.cc)
Copied: mc/3D/CitcomS/trunk/module/mesher.h (from rev 3979, mc/3D/CitcomS/trunk/module/Regional/mesher.h)
Copied: mc/3D/CitcomS/trunk/module/misc.cc (from rev 3982, mc/3D/CitcomS/trunk/module/Regional/misc.cc)
Copied: mc/3D/CitcomS/trunk/module/misc.h (from rev 3982, mc/3D/CitcomS/trunk/module/Regional/misc.h)
Copied: mc/3D/CitcomS/trunk/module/outputs.cc (from rev 3979, mc/3D/CitcomS/trunk/module/Regional/outputs.cc)
Copied: mc/3D/CitcomS/trunk/module/outputs.h (from rev 3979, mc/3D/CitcomS/trunk/module/Regional/outputs.h)
Copied: mc/3D/CitcomS/trunk/module/setProperties.cc (from rev 3979, mc/3D/CitcomS/trunk/module/Regional/setProperties.cc)
Copied: mc/3D/CitcomS/trunk/module/setProperties.h (from rev 3979, mc/3D/CitcomS/trunk/module/Regional/setProperties.h)
Copied: mc/3D/CitcomS/trunk/module/stokes_solver.cc (from rev 3979, mc/3D/CitcomS/trunk/module/Regional/stokes_solver.cc)
Copied: mc/3D/CitcomS/trunk/module/stokes_solver.h (from rev 3979, mc/3D/CitcomS/trunk/module/Regional/stokes_solver.h)
Modified: mc/3D/CitcomS/trunk/tests/exchange.py
===================================================================
--- mc/3D/CitcomS/trunk/tests/exchange.py 2006-07-07 21:36:32 UTC (rev 3982)
+++ mc/3D/CitcomS/trunk/tests/exchange.py 2006-07-07 22:35:14 UTC (rev 3983)
@@ -105,15 +105,15 @@
def findLayout(self, layout):
- import CitcomS.Exchanger
+ import ExchangerLib
if layout.coarse:
self.exchanger = self.inventory.coarse
self.communicator = layout.coarse
- self.all_variables = CitcomS.Exchanger.CoarsereturnE()
+ self.all_variables = ExchangerLib.CoarsereturnE()
elif layout.fine:
self.exchanger = self.inventory.fine
self.communicator = layout.fine
- self.all_variables = CitcomS.Exchanger.FinereturnE()
+ self.all_variables = ExchangerLib.FinereturnE()
else:
import journal
journal.warning(self.name).log("node '%d' is an orphan" % layout.rank)
@@ -156,10 +156,10 @@
import mpi
# testing Exchangermodule.so
- import CitcomS.Exchanger
+ import ExchangerLib
if not mpi.world().rank:
- print CitcomS.Exchanger.copyright()
- print dir(CitcomS.Exchanger)
+ print ExchangerLib.copyright()
+ print dir(ExchangerLib)
import journal
#journal.debug("Array2D").activate()
More information about the cig-commits
mailing list