Make the VTKReader more flexible.

[modules/med.git] / src / ParaMEDMEMComponent / ParaMEDMEMComponent_i.cxx

diff --git a/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.cxx b/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.cxx
index 18a6363f45be07f450b93cbed1d0d73c613fd2fd..1f3414e3fd41088bfd5362885652f62a443642b4 100644 (file)
--- a/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.cxx
+++ b/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -234,8 +234,7 @@ void ParaMEDMEMComponent_i::setInterpolationOptions(const char * coupling,
                                                     CORBA::Double max_distance_for_3Dsurf_intersect,
                                                     CORBA::Long orientation,
                                                     CORBA::Boolean measure_abs,
-                                                    const char * splitting_policy,
-                                                    CORBA::Boolean P1P0_bary_method ) throw(SALOME::SALOME_Exception)
+                                                    const char * splitting_policy) throw(SALOME::SALOME_Exception)
 {
   except_st *est;
   void *ret_th;
@@ -262,7 +261,6 @@ void ParaMEDMEMComponent_i::setInterpolationOptions(const char * coupling,
           st->orientation = orientation;
           st->measure_abs = measure_abs;
           st->splitting_policy = splitting_policy;
-          st->P1P0_bary_method = P1P0_bary_method;
           pthread_create(&(th[ip]),NULL,th_setinterpolationoptions,(void*)st);
         }
     }
@@ -280,8 +278,7 @@ void ParaMEDMEMComponent_i::setInterpolationOptions(const char * coupling,
                                                              max_distance_for_3Dsurf_intersect,
                                                              orientation,
                                                              measure_abs,
-                                                             splitting_policy,
-                                                             P1P0_bary_method );
+                                                             splitting_policy );
 
   if(!ret)
     {
@@ -452,9 +449,9 @@ void ParaMEDMEMComponent_i::_initializeCoupling(SALOME_MED::MPIMEDCouplingFieldD
         st->compo = compo._retn();
         st->coupling = coupling;
         st->ior = lcompo;
-       
+        
         pthread_create(&(th[0]),NULL,th_initializecouplingdist,(void*)st);
-         
+        
         //initializing the coupling on the local object
         initializeCoupling (coupling.c_str(), rcompo.c_str());
         pthread_join (th[0], &ret_th); 
@@ -511,8 +508,7 @@ void *th_setinterpolationoptions(void *s)
                                      st->max_distance_for_3Dsurf_intersect,
                                      st->orientation,
                                      st->measure_abs,
-                                     st->splitting_policy,
-                                     st->P1P0_bary_method);
+                                     st->splitting_policy);
     }
   catch(const SALOME::SALOME_Exception &ex)
     {