/[escript]/branches/py3_attempt2/finley/src/CPPAdapter/MeshAdapterFactory.cpp
ViewVC logotype

Diff of /branches/py3_attempt2/finley/src/CPPAdapter/MeshAdapterFactory.cpp

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

revision 3879 by jfenwick, Thu Mar 15 06:49:42 2012 UTC revision 3880 by jfenwick, Wed Mar 21 10:21:26 2012 UTC
# Line 11  Line 11 
11  *  *
12  *******************************************************/  *******************************************************/
13    
   
14  #include "MeshAdapterFactory.h"  #include "MeshAdapterFactory.h"
15  #include "FinleyError.h"  #include "FinleyError.h"
16  extern "C" {  extern "C" {
# Line 31  extern "C" { Line 30  extern "C" {
30  using namespace std;  using namespace std;
31  using namespace escript;  using namespace escript;
32    
   
   
33  namespace finley {  namespace finley {
34    
35  #ifdef USE_NETCDF  #ifdef USE_NETCDF
# Line 657  namespace finley { Line 654  namespace finley {
654                    
655        }        }
656                
657        Domain_ptr res=brick(extract<int>(args[0]), extract<int>(args[1]),        Domain_ptr res=brick(static_cast<int>(extract<float>(args[0])), static_cast<int>(extract<float>(args[1])),
658                             extract<int>(args[2]), extract<int>(args[3]),                             static_cast<int>(extract<float>(args[2])), extract<int>(args[3]),
659                             extract<double>(args[4]), extract<double>(args[5]),                             extract<double>(args[4]), extract<double>(args[5]),
660                             extract<double>(args[6]), extract<int>(args[7]),                             extract<double>(args[6]), extract<int>(args[7]),
661                             extract<int>(args[8]), extract<int>(args[9]),                             extract<int>(args[8]), extract<int>(args[9]),
# Line 797  namespace finley { Line 794  namespace finley {
794            }            }
795        }        }
796                
797        return rectangle(extract<int>(args[0]), extract<int>(args[1]),        return rectangle(static_cast<int>(extract<float>(args[0])), static_cast<int>(extract<float>(args[1])),
798                         extract<int>(args[2]), extract<double>(args[3]),                         extract<int>(args[2]), extract<double>(args[3]),
799                         extract<double>(args[4]), extract<int>(args[5]),                         extract<double>(args[4]), extract<int>(args[5]),
800                         extract<int>(args[6]), extract<int>(args[7]),                         extract<int>(args[6]), extract<int>(args[7]),

Legend:
Removed from v.3879  
changed lines
  Added in v.3880

  ViewVC Help
Powered by ViewVC 1.1.26