/[escript]/branches/domexper/dudley/src/SConscript
ViewVC logotype

Diff of /branches/domexper/dudley/src/SConscript

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3184 by jfenwick, Wed Sep 15 00:23:42 2010 UTC revision 3189 by jfenwick, Thu Sep 16 05:20:34 2010 UTC
# Line 18  Import('*') Line 18  Import('*')
18    
19  local_env = clone_env(env_mpi)  local_env = clone_env(env_mpi)
20  py_wrapper_local_env = clone_env(env_mpi)  py_wrapper_local_env = clone_env(env_mpi)
21    local_unroll_env = clone_env(env_mpi)
22    local_unroll_env.Append(CFLAGS = env_mpi['dudley_assemble_flags'])
23    
24    
25  # Remove the sharedlibrary prefix on all platform - we don't want 'lib' mucking with our python modules  # Remove the sharedlibrary prefix on all platform - we don't want 'lib' mucking with our python modules
26  del py_wrapper_local_env['SHLIBPREFIX']  del py_wrapper_local_env['SHLIBPREFIX']
# Line 36  sources = """ Line 39  sources = """
39      Assemble_addToSystemMatrix.c      Assemble_addToSystemMatrix.c
40      Assemble_getAssembleParameters.c      Assemble_getAssembleParameters.c
41      Assemble_getSize.c      Assemble_getSize.c
     Assemble_gradient.c  
42      Assemble_integrate.c      Assemble_integrate.c
43      Assemble_interpolate.c      Assemble_interpolate.c
     Assemble_jacobeans.c  
44      Assemble_setNormal.c      Assemble_setNormal.c
45      ElementFile.c      ElementFile.c
46      ElementFile_allocTable.c      ElementFile_allocTable.c
# Line 104  sources = """ Line 105  sources = """
105      CPPAdapter/SystemMatrixAdapter.cpp      CPPAdapter/SystemMatrixAdapter.cpp
106      CPPAdapter/TransportProblemAdapter.cpp      CPPAdapter/TransportProblemAdapter.cpp
107  """.split()  """.split()
108    unroll_sources= """
109        Assemble_gradient.c
110        Assemble_jacobeans.c
111    """.split()
112    
113    
114  headers = """  headers = """
115      Assemble.h      Assemble.h
116      ElementFile.h      ElementFile.h
# Line 143  py_wrapper_local_env.Append(LIBS = ['dud Line 150  py_wrapper_local_env.Append(LIBS = ['dud
150  module_name = 'dudley'  module_name = 'dudley'
151  py_wrapper_name = module_name + 'cpp'  py_wrapper_name = module_name + 'cpp'
152    
153  lib = local_env.SharedLibrary(module_name, sources)  un = [ local_unroll_env.SharedObject(x) for x in unroll_sources]
154    
155    lib = local_env.SharedLibrary(module_name, sources+un)
156  env.Alias('target_dudley_so', lib)  env.Alias('target_dudley_so', lib)
157    
158  py_wrapper_lib = py_wrapper_local_env.SharedLibrary(py_wrapper_name, 'CPPAdapter/dudleycpp.cpp')  py_wrapper_lib = py_wrapper_local_env.SharedLibrary(py_wrapper_name, 'CPPAdapter/dudleycpp.cpp')

Legend:
Removed from v.3184  
changed lines
  Added in v.3189

  ViewVC Help
Powered by ViewVC 1.1.26