/[escript]/branches/trilinos_from_5897/dudley/src/CPPAdapter/MeshAdapterFactory.h
ViewVC logotype

Diff of /branches/trilinos_from_5897/dudley/src/CPPAdapter/MeshAdapterFactory.h

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

revision 6008 by caltinay, Fri Feb 5 03:37:49 2016 UTC revision 6009 by caltinay, Wed Mar 2 04:13:26 2016 UTC
# Line 14  Line 14 
14  *  *
15  *****************************************************************************/  *****************************************************************************/
16    
   
17  #if !defined  dudley_MeshAdapterFactory_20040526_H  #if !defined  dudley_MeshAdapterFactory_20040526_H
18  #define dudley_MeshAdapterFactory_20040526_H  #define dudley_MeshAdapterFactory_20040526_H
 #include "system_dep.h"  
19    
20    #include "system_dep.h"
21  #include "MeshAdapter.h"  #include "MeshAdapter.h"
22    
23  #include "escript/AbstractContinuousDomain.h"  #include <escript/AbstractContinuousDomain.h>
24    
25  #include <boost/python/list.hpp>  #include <boost/python/list.hpp>
26    
# Line 70  namespace dudley { Line 69  namespace dudley {
69       \param reducedIntegrationOrder Input - order of the reduced quadrature scheme.         \param reducedIntegrationOrder Input - order of the reduced quadrature scheme.  
70       If reducedIntegrationOrder<0 the integration order is selected independently.       If reducedIntegrationOrder<0 the integration order is selected independently.
71       \param optimize Input - switches on the optimization of node labels       \param optimize Input - switches on the optimization of node labels
      \param useMacroElements  
72    */    */
73    DUDLEY_DLL_API    DUDLEY_DLL_API
 //   escript::AbstractContinuousDomain* readGmsh(const std::string& fileName,  
74    escript::Domain_ptr readGmsh(const std::string& fileName,    escript::Domain_ptr readGmsh(const std::string& fileName,
75                       int numDim,                       int numDim,
76                       int integrationOrder=-1,                       int integrationOrder=-1,
77                       int reducedIntegrationOrder=-1,                       int reducedIntegrationOrder=-1,
78                       int optimize=0,                       int optimize=0);
                      int useMacroElements=0);  
79                                            
80                                            
81     /**     /**
# Line 115  namespace dudley { Line 111  namespace dudley {
111       \param optimize       \param optimize
112    */    */
113    DUDLEY_DLL_API    DUDLEY_DLL_API
114    escript::Domain_ptr brick(esysUtils::JMPI& mpi_info, double n0=1,double n1=1,double n2=1,int order=1,    escript::Domain_ptr brick(escript::JMPI& mpi_info, double n0=1,double n1=1,double n2=1,int order=1,
115                      double l0=1.0,double l1=1.0,double l2=1.0,                      double l0=1.0,double l1=1.0,double l2=1.0,
116                      int periodic0=0,int periodic1=0,                      int periodic0=0,int periodic1=0,
117                      int periodic2=0,                      int periodic2=0,
# Line 145  namespace dudley { Line 141  namespace dudley {
141       \param optimize       \param optimize
142    */    */
143    DUDLEY_DLL_API    DUDLEY_DLL_API
144    escript::Domain_ptr rectangle(esysUtils::JMPI& mpi_info, double n0=1,double n1=1,int order=1,    escript::Domain_ptr rectangle(escript::JMPI& mpi_info, double n0=1,double n1=1,int order=1,
145                                        double l0=1.0, double l1=1.0,                                        double l0=1.0, double l1=1.0,
146                                        int periodic0=false,int periodic1=false,                                        int periodic0=false,int periodic1=false,
147                                        int integrationOrder=-1,                                        int integrationOrder=-1,

Legend:
Removed from v.6008  
changed lines
  Added in v.6009

  ViewVC Help
Powered by ViewVC 1.1.26