diff --git a/Plugin/AnalyseCurvedMesh.cpp b/Plugin/AnalyseCurvedMesh.cpp
index 3edb3352987226db9f4d21d7cafec4590d4e4c6e..9811032167d88ee5602c50e3b8f0535919af2f09 100644
--- a/Plugin/AnalyseCurvedMesh.cpp
+++ b/Plugin/AnalyseCurvedMesh.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
@@ -797,4 +797,4 @@ int GMSH_AnalyseCurvedMeshPlugin::division
       }
     }
     Msg::Info(" ");
-  }*/
\ No newline at end of file
+  }*/
diff --git a/Plugin/AnalyseCurvedMesh.h b/Plugin/AnalyseCurvedMesh.h
index 985cdc73835e64ad70a78bea507c16f7e373958f..f00a97a87e086479c9958f27046b572b4107007d 100644
--- a/Plugin/AnalyseCurvedMesh.h
+++ b/Plugin/AnalyseCurvedMesh.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Annotate.cpp b/Plugin/Annotate.cpp
index 66146812334dfbd1115137493d1b766388d80929..3ff4aa216e2158b8932cb13ed9105ccd35c40fb0 100644
--- a/Plugin/Annotate.cpp
+++ b/Plugin/Annotate.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Annotate.h b/Plugin/Annotate.h
index 4c0bad10109d2fc3af6a7f9192ca6e83bacfba1c..c29a77c2a51a0cb32573e6bd8aa1f78cb7ba0532 100644
--- a/Plugin/Annotate.h
+++ b/Plugin/Annotate.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Bubbles.cpp b/Plugin/Bubbles.cpp
index b904f57db8bdda2b3a09eb2da70b8542d95d92db..e21e96a4571d6ff65f4aa3a79c21cc8468f39854 100644
--- a/Plugin/Bubbles.cpp
+++ b/Plugin/Bubbles.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Bubbles.h b/Plugin/Bubbles.h
index f6ba36852f358a05f8f8c2877e4012f416272121..db18714571b38d04aafd6f397577294798acdd63 100644
--- a/Plugin/Bubbles.h
+++ b/Plugin/Bubbles.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/CMakeLists.txt b/Plugin/CMakeLists.txt
index c2c0a550a2fefbcaad2849872e9322dd42a07627..15fae2bc0f44bd9842b9e56fc8bf5f9a9590226d 100644
--- a/Plugin/CMakeLists.txt
+++ b/Plugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+# Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 #
 # See the LICENSE.txt file for license information. Please report all
 # bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Curl.cpp b/Plugin/Curl.cpp
index 307ac6cb83481d97cd4ee589d07ca8f21cc121e4..1051eafbb292459bf5c2e75e6dd14334d0cab7ed 100644
--- a/Plugin/Curl.cpp
+++ b/Plugin/Curl.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
@@ -44,7 +44,7 @@ PView *GMSH_CurlPlugin::execute(PView *v)
   PView *v1 = getView(iView, v);
   if(!v1) return v;
 
-  PViewData *data1 = v1->getData(true); // get adaptive data if available
+  PViewData *data1 = getPossiblyAdaptiveData(v1);
   if(data1->hasMultipleMeshes()){
     Msg::Error("Curl plugin cannot be run on multi-mesh views");
     return v;
diff --git a/Plugin/Curl.h b/Plugin/Curl.h
index 5a10f7ed176b24936325eeb95d223d8a9a743393..de366551faca07de57a0cc11eaa3b93f6777ed28 100644
--- a/Plugin/Curl.h
+++ b/Plugin/Curl.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/CutGrid.cpp b/Plugin/CutGrid.cpp
index c74cf9129ff17462394a4b9bd5dde1e11144fb8a..cd7ef8786c1fe4eed37d64a34a620213aade4b36 100644
--- a/Plugin/CutGrid.cpp
+++ b/Plugin/CutGrid.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
@@ -313,7 +313,7 @@ PView *GMSH_CutGridPlugin::GenerateView(PView *v1, int connect)
   if(getNbU() <= 0 || getNbV() <= 0)
     return v1;
 
-  PViewData *data1 = v1->getData(true); // get adaptive data if available
+  PViewData *data1 = getPossiblyAdaptiveData(v1);
 
   PView *v2 = new PView();
   PViewDataList *data2 = getDataList(v2);
diff --git a/Plugin/CutGrid.h b/Plugin/CutGrid.h
index 3e322737c1e3f666749721474049e0e2865bf8c4..66147b3cb3dc99451847fc0120aaf0dcb6a0aa32 100644
--- a/Plugin/CutGrid.h
+++ b/Plugin/CutGrid.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/CutParametric.cpp b/Plugin/CutParametric.cpp
index 584ac0d2663f7f41bdf28de3661238a716bd9cdc..e066b3adac103a0a1670e870874e4f9b45c54e1e 100644
--- a/Plugin/CutParametric.cpp
+++ b/Plugin/CutParametric.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
@@ -237,7 +237,7 @@ PView *GMSH_CutParametricPlugin::execute(PView *v)
 
   if(!fillXYZ()) return v;
 
-  PViewData *data1 = v1->getData();
+  PViewData *data1 = getPossiblyAdaptiveData(v1);
 
   int numSteps = data1->getNumTimeSteps();
   int nbU = (int)CutParametricOptions_Number[2].def;
diff --git a/Plugin/CutParametric.h b/Plugin/CutParametric.h
index 1f1a8620ab98c92bd576f53bc61e712da4561cd8..1c6594c09f1f9ddbadf57e87455144dbdba523e9 100644
--- a/Plugin/CutParametric.h
+++ b/Plugin/CutParametric.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/CutPlane.cpp b/Plugin/CutPlane.cpp
index e8b1376606ee350aa053c9f0a586ff81c47a1cad..6548a7f38ac5386184c6b6614b83d22de47ec5a1 100644
--- a/Plugin/CutPlane.cpp
+++ b/Plugin/CutPlane.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/CutPlane.h b/Plugin/CutPlane.h
index 9ca821e2e56e0540fb60636fe55b48a0b8f3b8ec..271754cdc054df6eb340e1fe59f6117e36038fad 100644
--- a/Plugin/CutPlane.h
+++ b/Plugin/CutPlane.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/CutSphere.cpp b/Plugin/CutSphere.cpp
index f3aa1f40afc2477336c5ea0ec7769d6d917b03de..a7f8c262f40a73f8bd556eda5a31827252593c89 100644
--- a/Plugin/CutSphere.cpp
+++ b/Plugin/CutSphere.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/CutSphere.h b/Plugin/CutSphere.h
index 0ef85f2d47417a9810b60b5810cf8ce6f2b11fd6..338394daa7eb9f9e0564e0dda1b305d4a802d94f 100644
--- a/Plugin/CutSphere.h
+++ b/Plugin/CutSphere.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Distance.cpp b/Plugin/Distance.cpp
index c29d9d45339367fd0218936660f4736c81ac4c2a..3b178a9ab89177c357017dde987171749c2ca632 100644
--- a/Plugin/Distance.cpp
+++ b/Plugin/Distance.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Distance.h b/Plugin/Distance.h
index 70f265d7c39c0f2ea9e6a996d9fb58f0e0681daa..70b2d0adea448bf788d9c105af139734bada2563 100644
--- a/Plugin/Distance.h
+++ b/Plugin/Distance.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Divergence.cpp b/Plugin/Divergence.cpp
index 6b02c42d2c34811df71d88017fae2b4fa87a0e44..d1f1698a8cc7cf46610763dc76be6aae4689cc22 100644
--- a/Plugin/Divergence.cpp
+++ b/Plugin/Divergence.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
@@ -44,7 +44,7 @@ PView *GMSH_DivergencePlugin::execute(PView *v)
   PView *v1 = getView(iView, v);
   if(!v1) return v;
 
-  PViewData *data1 = v1->getData(true); // get adaptive data if available
+  PViewData *data1 = getPossiblyAdaptiveData(v1);
   if(data1->hasMultipleMeshes()){
     Msg::Error("Divergence plugin cannot be run on multi-mesh views");
     return v;
diff --git a/Plugin/Divergence.h b/Plugin/Divergence.h
index ef6f381317d9f6c8066123404413df82f97c345e..a10df9854b5d556cb15653f839fb1b67ad7f34b3 100644
--- a/Plugin/Divergence.h
+++ b/Plugin/Divergence.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Eigenvalues.cpp b/Plugin/Eigenvalues.cpp
index 933d91d440a6a18ddb2eb49b0752f5953ea638c8..8fe6eaa78d73cb379b771d37e4b73bef711de7be 100644
--- a/Plugin/Eigenvalues.cpp
+++ b/Plugin/Eigenvalues.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
@@ -44,7 +44,7 @@ PView *GMSH_EigenvaluesPlugin::execute(PView *v)
   PView *v1 = getView(iView, v);
   if(!v1) return v;
 
-  PViewData *data1 = v1->getData();
+  PViewData *data1 = getPossiblyAdaptiveData(v1);
   if(data1->hasMultipleMeshes()){
     Msg::Error("Eigenvalues plugin cannot be run on multi-mesh views");
     return v;
diff --git a/Plugin/Eigenvalues.h b/Plugin/Eigenvalues.h
index 7c71996c8acc7123594e0f62aca22e5028a424e3..b0fd2981f6af4b62e24dc79dad324efd27c2f080 100644
--- a/Plugin/Eigenvalues.h
+++ b/Plugin/Eigenvalues.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Eigenvectors.cpp b/Plugin/Eigenvectors.cpp
index 2a84e7c954de24eb392bc964e3fb57e70fc63eda..3060d03438d8be6d6a55404ab3fcd8d0367570c9 100644
--- a/Plugin/Eigenvectors.cpp
+++ b/Plugin/Eigenvectors.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
@@ -52,7 +52,7 @@ PView *GMSH_EigenvectorsPlugin::execute(PView *v)
   PView *v1 = getView(iView, v);
   if(!v1) return v;
 
-  PViewData *data1 = v1->getData();
+  PViewData *data1 = getPossiblyAdaptiveData(v1);
   if(data1->hasMultipleMeshes()){
     Msg::Error("Eigenvectors plugin cannot be run on multi-mesh views");
     return v;
diff --git a/Plugin/Eigenvectors.h b/Plugin/Eigenvectors.h
index ec8dc20d78020c2bdb4547c5c4685301f0b5f4f0..b568477b01f8e7ff659aba92ae22ce20eabcd8dc 100644
--- a/Plugin/Eigenvectors.h
+++ b/Plugin/Eigenvectors.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/ExtractEdges.cpp b/Plugin/ExtractEdges.cpp
index f3fade5443ed4ee06d581438021a7e405b4bc9ca..d7591e9578936bb5a6fc1ac6242362c02f1b52d5 100644
--- a/Plugin/ExtractEdges.cpp
+++ b/Plugin/ExtractEdges.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/ExtractEdges.h b/Plugin/ExtractEdges.h
index 795ac0ed44304af5baa76311f603271226b72816..352b15d33a95a361912ae529707052690e83877e 100644
--- a/Plugin/ExtractEdges.h
+++ b/Plugin/ExtractEdges.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/ExtractElements.cpp b/Plugin/ExtractElements.cpp
index 3c16fe2fe210244d6687207aad757b67f818ce91..3824c913c199de630bafb60e198a0d923c904754 100644
--- a/Plugin/ExtractElements.cpp
+++ b/Plugin/ExtractElements.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
@@ -55,7 +55,7 @@ PView *GMSH_ExtractElementsPlugin::execute(PView *v)
   PView *v1 = getView(iView, v);
   if(!v1) return v;
 
-  PViewData *data1 = v1->getData();
+  PViewData *data1 = getPossiblyAdaptiveData(v1);
 
   bool checkMinMax = MinVal != MaxVal;
 
diff --git a/Plugin/ExtractElements.h b/Plugin/ExtractElements.h
index a735cc5d8f977a6d25059a99107b4838758d6d8c..8b5d81d3a2fc2573541f3c55ccbbc3988bbd85a9 100644
--- a/Plugin/ExtractElements.h
+++ b/Plugin/ExtractElements.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/FieldFromAmplitudePhase.cpp b/Plugin/FieldFromAmplitudePhase.cpp
index 2a5bad0e8e6521f8a7ffd8ba36b33e01ab7e960f..7681dd0761c09571e79d86abe169601201bf435d 100644
--- a/Plugin/FieldFromAmplitudePhase.cpp
+++ b/Plugin/FieldFromAmplitudePhase.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/FieldFromAmplitudePhase.h b/Plugin/FieldFromAmplitudePhase.h
index ea8293bf77371e7c21945711cd229ffc8acc71f8..e5c94c760bd421a8c7bda0d2a1543ecdc5decd3b 100644
--- a/Plugin/FieldFromAmplitudePhase.h
+++ b/Plugin/FieldFromAmplitudePhase.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/GSHHS.h b/Plugin/GSHHS.h
index aa5b5f4705fc3ffbd99f5562d16b297623e18619..ff3803bd8e1b8fe7a82aa3e9f555bcb1a365323c 100644
--- a/Plugin/GSHHS.h
+++ b/Plugin/GSHHS.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Gradient.cpp b/Plugin/Gradient.cpp
index f299217a04dcd93da42931c957e0bd5e6cd5e516..17b210c0a650be3b099ebb0fcbd8558710e35cc5 100644
--- a/Plugin/Gradient.cpp
+++ b/Plugin/Gradient.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
@@ -44,7 +44,7 @@ PView *GMSH_GradientPlugin::execute(PView *v)
   PView *v1 = getView(iView, v);
   if(!v1) return v;
 
-  PViewData *data1 = v1->getData(true); // get adaptive data if available
+  PViewData *data1 = getPossiblyAdaptiveData(v1);
   if(data1->hasMultipleMeshes()){
     Msg::Error("Gradient plugin cannot be run on multi-mesh views");
     return v;
diff --git a/Plugin/Gradient.h b/Plugin/Gradient.h
index abaced418aec2cd8b7c75f65fb78404cfcced83e..bd751a7312fb7c8ce5ba52aa7f49a95881b18e83 100644
--- a/Plugin/Gradient.h
+++ b/Plugin/Gradient.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/HarmonicToTime.cpp b/Plugin/HarmonicToTime.cpp
index 67b4b5f498ce32fa3204ddfb355fc4f95b534a76..d85dd6102447ee6772c38c427618f651711a4b92 100644
--- a/Plugin/HarmonicToTime.cpp
+++ b/Plugin/HarmonicToTime.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/HarmonicToTime.h b/Plugin/HarmonicToTime.h
index 4d6c85a4605f7f191c9e29cb5380f8a209511a0b..085d0da7880a09d4da77ad74e38417ff40f53d10 100644
--- a/Plugin/HarmonicToTime.h
+++ b/Plugin/HarmonicToTime.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/HomologyComputation.cpp b/Plugin/HomologyComputation.cpp
index 683305092ed18504e23e16fef78abd7234bed072..529ace41fc2d555e2915c9aa17fde26d408a0899 100644
--- a/Plugin/HomologyComputation.cpp
+++ b/Plugin/HomologyComputation.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/HomologyComputation.h b/Plugin/HomologyComputation.h
index ad4b826d39b6cca95687083d3448a580b048cb92..a691a5b9e37476eac5ba7ffb088095f11eddceb6 100644
--- a/Plugin/HomologyComputation.h
+++ b/Plugin/HomologyComputation.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Integrate.cpp b/Plugin/Integrate.cpp
index 31870fae86fc0bf48b309c67d6dabc4330bed2c3..bb2577e0d78fed05aa2d34476996fc8d6057d9be 100644
--- a/Plugin/Integrate.cpp
+++ b/Plugin/Integrate.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
@@ -46,7 +46,7 @@ PView *GMSH_IntegratePlugin::execute(PView * v)
   PView *v1 = getView(iView, v);
   if(!v1) return v;
 
-  PViewData *data1 = v1->getData(true); // get adaptive data if available
+  PViewData *data1 = getPossiblyAdaptiveData(v1);
   PView *v2 = new PView();
   PViewDataList *data2 = getDataList(v2);
   
diff --git a/Plugin/Integrate.h b/Plugin/Integrate.h
index 486221d89fa3ed3963ae01aa7c413cdc43343564..d84fe71d5c6a4d402ef0007f1e7fe5aa1ee42d7a 100644
--- a/Plugin/Integrate.h
+++ b/Plugin/Integrate.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Isosurface.cpp b/Plugin/Isosurface.cpp
index 9198ee933169e19f78bf4b51def54321958c10a1..2ec0d6ab7b4ab5454feb0d2c895b122ac7242deb 100644
--- a/Plugin/Isosurface.cpp
+++ b/Plugin/Isosurface.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Isosurface.h b/Plugin/Isosurface.h
index 174a177208b2b081f90299e59bd8d266daf6a6cf..99c75ea5af18805d76172c26a48c63a92998739b 100644
--- a/Plugin/Isosurface.h
+++ b/Plugin/Isosurface.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Lambda2.cpp b/Plugin/Lambda2.cpp
index 647263c06863eb0d5088bcbb36e5a9cff8170d76..579203b8e0c40b77e7f840233448f41c2551a92e 100644
--- a/Plugin/Lambda2.cpp
+++ b/Plugin/Lambda2.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Lambda2.h b/Plugin/Lambda2.h
index 38031da8456899a0456af1e746fbad82329d8fe0..a4be8bb560b51ca77a4121c105be58364774d2c6 100644
--- a/Plugin/Lambda2.h
+++ b/Plugin/Lambda2.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Levelset.cpp b/Plugin/Levelset.cpp
index 79b5589b67795a693cc2a1e95f67795508cae69a..75097b880eccd4dfdc43551913d74b46e79c511b 100644
--- a/Plugin/Levelset.cpp
+++ b/Plugin/Levelset.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
@@ -407,7 +407,7 @@ PView *GMSH_LevelsetPlugin::execute(PView *v)
   }
 
   // get adaptive data if available
-  PViewData *vdata = v->getData(true), *wdata;
+  PViewData *vdata = getPossiblyAdaptiveData(v), *wdata;
   if(_valueView < 0) {
     wdata = vdata;
   }
@@ -417,7 +417,7 @@ PView *GMSH_LevelsetPlugin::execute(PView *v)
     wdata = vdata;
   }
   else{
-    wdata = PView::list[_valueView]->getData();
+    wdata = getPossiblyAdaptiveData(PView::list[_valueView]);
   }
 
   // sanity checks
diff --git a/Plugin/Levelset.h b/Plugin/Levelset.h
index 93233e7257832c4fc7c008d11cee86a33943475c..fb5956aae673b9efd4ff0e0ef3bac7893ecc9757 100644
--- a/Plugin/Levelset.h
+++ b/Plugin/Levelset.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/LongitudeLatitude.cpp b/Plugin/LongitudeLatitude.cpp
index d372a43c40dbe9feef35f632b5d52aad3f8f179d..5af82460ab3f8c7266de39c4a40f6f69130a8498 100644
--- a/Plugin/LongitudeLatitude.cpp
+++ b/Plugin/LongitudeLatitude.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/LongitudeLatitude.h b/Plugin/LongitudeLatitude.h
index 328b896d97994532f56d381a0469ddc657779573..08de79bfcc5b77199e507f2e28eafe2fa50d36c5 100644
--- a/Plugin/LongitudeLatitude.h
+++ b/Plugin/LongitudeLatitude.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/MakeSimplex.cpp b/Plugin/MakeSimplex.cpp
index 6934d3635932994a5cab35d5d2a118c1658e597f..651c3617d376436dacb9f837af774f94e12ba5a9 100644
--- a/Plugin/MakeSimplex.cpp
+++ b/Plugin/MakeSimplex.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/MakeSimplex.h b/Plugin/MakeSimplex.h
index 4d851f361240badbb8ade4d8787165c67f551449..a85d01630e77698f90802e76ee23476628c15dbf 100644
--- a/Plugin/MakeSimplex.h
+++ b/Plugin/MakeSimplex.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/MathEval.cpp b/Plugin/MathEval.cpp
index 7cf42c3d4a5c9f6b67c48780560609ecc61be4fd..1fbcd6dfc89f0e43eb96f38b4c4a0530a6e488e9 100644
--- a/Plugin/MathEval.cpp
+++ b/Plugin/MathEval.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
@@ -95,7 +95,7 @@ PView *GMSH_MathEvalPlugin::execute(PView *view)
   
   PView *v1 = getView(iView, view);
   if(!v1) return view;
-  PViewData *data1 = v1->getData();
+  PViewData *data1 = getPossiblyAdaptiveData(v1);
 
   if(data1->hasMultipleMeshes()){
     Msg::Error("MathEval plugin cannot be applied to multi-mesh views");
@@ -111,7 +111,7 @@ PView *GMSH_MathEvalPlugin::execute(PView *view)
     }
   }
 
-  PViewData *otherData = otherView->getData();
+  PViewData *otherData = getPossiblyAdaptiveData(otherView);
   if(otherData->hasMultipleMeshes()){
     Msg::Error("MathEval plugin cannot be applied to multi-mesh views");
     return view;
diff --git a/Plugin/MathEval.h b/Plugin/MathEval.h
index df6ff53695aa376e8b75d86415d539bab9f70aa0..bab16f4fa2a15e4c99109bda21fdbd7c8d89c2bf 100644
--- a/Plugin/MathEval.h
+++ b/Plugin/MathEval.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/MinMax.cpp b/Plugin/MinMax.cpp
index bee33744eb8cb98e1a4f782d7c34577e7010f503..10ed76d800a9485abea5dc65f908a07f5942401b 100644
--- a/Plugin/MinMax.cpp
+++ b/Plugin/MinMax.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/MinMax.h b/Plugin/MinMax.h
index ae37f205d8937cf49e1b492049bcedbced22127a..8444fcb14b6646a1d6817a63a71a4e443699525b 100644
--- a/Plugin/MinMax.h
+++ b/Plugin/MinMax.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/ModifyComponent.cpp b/Plugin/ModifyComponent.cpp
index 632b3a05940b1bbee2852fa1c4b8ad3aeca75096..904d12ec506b24d7f3acc368f417d0be48c81bf5 100644
--- a/Plugin/ModifyComponent.cpp
+++ b/Plugin/ModifyComponent.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
@@ -100,7 +100,7 @@ PView *GMSH_ModifyComponentPlugin::execute(PView *view)
   PView *v1 = getView(iView, view);
   if(!v1) return view;
 
-  PViewData *data1 = v1->getData();
+  PViewData *data1 = getPossiblyAdaptiveData(v1);
 
   if(timeStep > data1->getNumTimeSteps() - 1){
     Msg::Error("Invalid time step (%d) in View[%d]: using step 0 instead",
@@ -117,7 +117,7 @@ PView *GMSH_ModifyComponentPlugin::execute(PView *view)
       Msg::Error("View[%d] does not exist: using self", otherView);
   }
 
-  PViewData *data2 = v2->getData();
+  PViewData *data2 = getPossiblyAdaptiveData(v2);
 
   if(otherTimeStep < 0 && data2->getNumTimeSteps() != data1->getNumTimeSteps()){
     Msg::Error("Number of time steps don't match: using step 0");
diff --git a/Plugin/ModifyComponent.h b/Plugin/ModifyComponent.h
index 30040c5a214ff79be2350dee2e248f6b4c1518bb..efac5d14b0882b149932fda9660977bee604f343 100644
--- a/Plugin/ModifyComponent.h
+++ b/Plugin/ModifyComponent.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/ModulusPhase.cpp b/Plugin/ModulusPhase.cpp
index d371ece4a5b8c09ea08892e24624a36f3856e007..ba74b53d0a779baae5fa14f09c6d2abb1dd153ba 100644
--- a/Plugin/ModulusPhase.cpp
+++ b/Plugin/ModulusPhase.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/ModulusPhase.h b/Plugin/ModulusPhase.h
index 55ff010f7ca23cd4b55142e580b67f01a8e048c8..9a62290d3413cf37f982e9b40b4b114af24782a3 100644
--- a/Plugin/ModulusPhase.h
+++ b/Plugin/ModulusPhase.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/NearestNeighbor.cpp b/Plugin/NearestNeighbor.cpp
index 1b598d9a6106bd1dcc852cdce16f7ff7e3cd0126..9509d9b5f35669b074cbf5c33545890807e8ad8f 100644
--- a/Plugin/NearestNeighbor.cpp
+++ b/Plugin/NearestNeighbor.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
@@ -46,7 +46,7 @@ PView *GMSH_NearestNeighborPlugin::execute(PView *v)
   
   PView *v1 = getView(iView, v);
   if(!v1) return v;
-  PViewData *data1 = v1->getData();
+  PViewData *data1 = getPossiblyAdaptiveData(v1);
 
   int totpoints = data1->getNumPoints();
   if(!totpoints){
diff --git a/Plugin/NearestNeighbor.h b/Plugin/NearestNeighbor.h
index de6f5623bb9029a3883e55bae51599d489bd99b4..d27f49d02de25b3afe73d288720b5fe64dd8d1fa 100644
--- a/Plugin/NearestNeighbor.h
+++ b/Plugin/NearestNeighbor.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Particles.cpp b/Plugin/Particles.cpp
index 21bfa752eee46b5dc41d4265acff7ee7a5814e3a..cd99cd40357fd7494bb95800a14edfa7b075fd90 100644
--- a/Plugin/Particles.cpp
+++ b/Plugin/Particles.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
@@ -217,7 +217,7 @@ PView *GMSH_ParticlesPlugin::execute(PView *v)
 
   PView *v1 = getView(iView, v);
   if(!v1) return v;
-  PViewData *data1 = v1->getData();
+  PViewData *data1 = getPossiblyAdaptiveData(v1);
 
   // sanity checks
   if(timeStep > data1->getNumTimeSteps() - 1){
diff --git a/Plugin/Particles.h b/Plugin/Particles.h
index bb754e8e98d6a4a0bbb6b95966a71d87ec7d6b46..209225d2e07a7595ec45e859b48fd261cda6736f 100644
--- a/Plugin/Particles.h
+++ b/Plugin/Particles.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Plugin.cpp b/Plugin/Plugin.cpp
index f0ee0db5a5e0ded969047bfa5ba7c04e1c74d62d..820cbf8502bcb59d02cccb35d8ca647913c1a9a2 100644
--- a/Plugin/Plugin.cpp
+++ b/Plugin/Plugin.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
@@ -90,6 +90,16 @@ PView *GMSH_PostPlugin::getView(int index, PView *view)
   }
 }
 
+PViewData *GMSH_PostPlugin::getPossiblyAdaptiveData(PView *view)
+{
+  if(!view) return 0;
+
+  if(view->getData()->isAdaptive())
+    Msg::Warning("Using adapted data from view '%s': only the current time step "
+                 "is available to the plugin", view->getData()->getName().c_str());
+  return view->getData(true);
+}
+
 PViewDataList *GMSH_PostPlugin::getDataList(PView *view, bool showError)
 {
   if(!view) return 0;
diff --git a/Plugin/Plugin.h b/Plugin/Plugin.h
index d896952f8bc234ce5399453ca2947bb12bfce9a2..1f67856c08771b7c062324fef58a54a1d52c156a 100644
--- a/Plugin/Plugin.h
+++ b/Plugin/Plugin.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
@@ -94,6 +94,9 @@ class GMSH_PostPlugin : public GMSH_Plugin
   virtual PView *getView(int index, PView *view);
   // get the data in list format
   virtual PViewDataList *getDataList(PView *view, bool showError=true);
+  // get the the adapted data (i.e. linear, on refined mesh) if
+  // available, otherwise get the original data
+  virtual PViewData *getPossiblyAdaptiveData(PView *view);
   virtual void assignSpecificVisibility() const {}
   virtual bool geometricalFilter(fullMatrix<double> *) const { return true; }
 };
diff --git a/Plugin/PluginManager.cpp b/Plugin/PluginManager.cpp
index 36caecaf91b544727f0784f1c1cfbe014803f944..e8520f371b08c6b02064c43ff7cc3b9e8995f961 100644
--- a/Plugin/PluginManager.cpp
+++ b/Plugin/PluginManager.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/PluginManager.h b/Plugin/PluginManager.h
index a5476c0ad0fbf55bf02e8d889c5bb93155eb7fd8..01242c96ccc99bc6d101de566bd5872b6275988c 100644
--- a/Plugin/PluginManager.h
+++ b/Plugin/PluginManager.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Probe.cpp b/Plugin/Probe.cpp
index 4655beda2f80c8d9c2b348f16c9acf49c2d8f46d..d15212bda003cae05ecb0497c97e22f44cd40bc4 100644
--- a/Plugin/Probe.cpp
+++ b/Plugin/Probe.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Probe.h b/Plugin/Probe.h
index cd40cd035ff44c1147a700c971c6037a96852a93..2846d692846b343b394c23c93380ee8d3a846b0a 100644
--- a/Plugin/Probe.h
+++ b/Plugin/Probe.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Remove.cpp b/Plugin/Remove.cpp
index 6290345f7532f4800b2a2615bd4d281180141c3a..87bef4ad2da5c25024743b7b0f3b6b84af5dac8e 100644
--- a/Plugin/Remove.cpp
+++ b/Plugin/Remove.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Remove.h b/Plugin/Remove.h
index 52aaeb0fcd1bc80e06908f4adb750b832fda0612..3a842ab74d34b39cd3a549a99618b59b73d0c974 100644
--- a/Plugin/Remove.h
+++ b/Plugin/Remove.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Skin.cpp b/Plugin/Skin.cpp
index a9f32f96390c775a77c003c4f1bf7582d9528dec..dfff3a0cc07c48dd01c3e0c1b46d952c3abb58ee 100644
--- a/Plugin/Skin.cpp
+++ b/Plugin/Skin.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
@@ -143,7 +143,7 @@ PView *GMSH_SkinPlugin::execute(PView *v)
 
   PView *v1 = getView(iView, v);
   if(!v1) return v;
-  PViewData *data1 = v1->getData(true); // get adaptive data if available
+  PViewData *data1 = getPossiblyAdaptiveData(v1);
 
   if(data1->hasMultipleMeshes()){
     Msg::Error("Skin plugin cannot be applied to multi-mesh views");
diff --git a/Plugin/Skin.h b/Plugin/Skin.h
index 6869cea7e3edf0a672a3afba9e94f193156d07f5..785cb011dfd983639b797dcc46ef62b4fdd6b97a 100644
--- a/Plugin/Skin.h
+++ b/Plugin/Skin.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Smooth.cpp b/Plugin/Smooth.cpp
index 2c14d554713d6a0e60df20c77b2133d81551518d..7733927e67cc0d7cd475ff6f72f0acbd63581a78 100644
--- a/Plugin/Smooth.cpp
+++ b/Plugin/Smooth.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Smooth.h b/Plugin/Smooth.h
index 2c04b91d2a2dce7474883fc57e05b91a0890c4f3..12e5c9b6ff3b24e6d03fd78a1407f7e9e1e8fb0c 100644
--- a/Plugin/Smooth.h
+++ b/Plugin/Smooth.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/SphericalRaise.cpp b/Plugin/SphericalRaise.cpp
index 4bfc578a9e37fb5802b604112b517cdb34c17f3e..10da7d36681484197fee430d7daa128d155a5eb2 100644
--- a/Plugin/SphericalRaise.cpp
+++ b/Plugin/SphericalRaise.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/SphericalRaise.h b/Plugin/SphericalRaise.h
index ce1ec0f17c4e4c3006d9c2c1e2e429e04979e50f..eb7845476d67c87702010a1555d8edbe65b80847 100644
--- a/Plugin/SphericalRaise.h
+++ b/Plugin/SphericalRaise.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/StreamLines.cpp b/Plugin/StreamLines.cpp
index 865d6299106f2b69a51c512b1c88b283f5219e54..ccfab0049018ae6be1547e245177da00dd744fbb 100644
--- a/Plugin/StreamLines.cpp
+++ b/Plugin/StreamLines.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
@@ -208,10 +208,10 @@ PView *GMSH_StreamLinesPlugin::execute(PView *v)
 
   PView *v1 = getView(iView, v);
   if(!v1) return v;
-  PViewData *data1 = v1->getData();
+  PViewData *data1 = getPossiblyAdaptiveData(v1);
 
   PView *v2 = (otherView < 0) ? 0 : getView(otherView, v);
-  PViewData *data2 = v2 ? v2->getData() : 0;
+  PViewData *data2 = v2 ? getPossiblyAdaptiveData(v2) : 0;
 
   // sanity checks
   if(timeStep > data1->getNumTimeSteps() - 1){
diff --git a/Plugin/StreamLines.h b/Plugin/StreamLines.h
index a02042b541cda259a06c06b79ce3a77bede7b1a3..40005a82c697cf89a068cfc0a36006d1d6303c52 100644
--- a/Plugin/StreamLines.h
+++ b/Plugin/StreamLines.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Tetrahedralize.cpp b/Plugin/Tetrahedralize.cpp
index 90bc73ab9a70ea6b62225b17d553bf729c08cb56..83f5599a53210a86709d8caa131ec4ebc02bfcd0 100644
--- a/Plugin/Tetrahedralize.cpp
+++ b/Plugin/Tetrahedralize.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Tetrahedralize.h b/Plugin/Tetrahedralize.h
index a1a586dc2954b3c974f2b72213b4879bb84d98a8..8c7ea8d37ea587ba4a37072e30425b61d5c8ece9 100644
--- a/Plugin/Tetrahedralize.h
+++ b/Plugin/Tetrahedralize.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Transform.cpp b/Plugin/Transform.cpp
index 810dc2142b86c5890b9f0cc151685a5a40e430cc..b23f80ea4f04bc27e390d7a8790d67413973986d 100644
--- a/Plugin/Transform.cpp
+++ b/Plugin/Transform.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Transform.h b/Plugin/Transform.h
index 0561a20dfea2484fd098dae5be7e01fea3144602..15892109ee11b1c0085cb82a1e6f82a1c4aeac79 100644
--- a/Plugin/Transform.h
+++ b/Plugin/Transform.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Triangulate.cpp b/Plugin/Triangulate.cpp
index 3f69ab34c2f9670c7a538a6fe0ee063359f1552f..0c5b4eb9911090c9eb2a5711d0d5fec08a842435 100644
--- a/Plugin/Triangulate.cpp
+++ b/Plugin/Triangulate.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Triangulate.h b/Plugin/Triangulate.h
index 6010e90231327e7152966e43d365374501b49d62..0249b63f6310cbb67a34970e9fcc72f31f9bbb7c 100644
--- a/Plugin/Triangulate.h
+++ b/Plugin/Triangulate.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Warp.cpp b/Plugin/Warp.cpp
index d80732283b28ae51b347e7061d5273b7dfd59257..96dee799084df1d2a2f2a5b1a458eee60f4b6a83 100644
--- a/Plugin/Warp.cpp
+++ b/Plugin/Warp.cpp
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
diff --git a/Plugin/Warp.h b/Plugin/Warp.h
index bba712c2fd737a52c7697f0884a683c06c57a16c..bc3b19496cef9b56b7d95deae7fc41ed17ff2e07 100644
--- a/Plugin/Warp.h
+++ b/Plugin/Warp.h
@@ -1,4 +1,4 @@
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+// Gmsh - Copyright (C) 1997-2011 C. Geuzaine, J.-F. Remacle
 //
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.