From a5aec7630c1c07afa4a5947bc2631928b3ed8ae2 Mon Sep 17 00:00:00 2001
From: Joachim Schoeberl <joachim.schoeberl@tuwien.ac.at>
Date: Sat, 31 Oct 2009 21:03:52 +0000
Subject: [PATCH] topology

---
 libsrc/meshing/meshtool.cpp         |  1 -
 libsrc/meshing/topology.hpp         |  6 ++----
 libsrc/visualization/vssolution.cpp |  1 +
 ng/ngpkg.cpp                        | 15 +++++++++++++++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/libsrc/meshing/meshtool.cpp b/libsrc/meshing/meshtool.cpp
index b69e9c26..3f024a10 100644
--- a/libsrc/meshing/meshtool.cpp
+++ b/libsrc/meshing/meshtool.cpp
@@ -997,5 +997,4 @@ namespace netgen
     PrintMessage (3, "Elements after Remove: ", mesh.GetNE());
   }
 
-
 }
diff --git a/libsrc/meshing/topology.hpp b/libsrc/meshing/topology.hpp
index d46342a2..9fec5cd6 100644
--- a/libsrc/meshing/topology.hpp
+++ b/libsrc/meshing/topology.hpp
@@ -51,10 +51,8 @@ public:
   void Update();
 
 
-  int GetNEdges () const
-  { return edge2vert.Size(); }
-  int GetNFaces () const
-  { return face2vert.Size(); }
+  int GetNEdges () const { return edge2vert.Size(); }
+  int GetNFaces () const { return face2vert.Size(); }
 
   static inline int GetNVertices (ELEMENT_TYPE et);
   static inline int GetNPoints (ELEMENT_TYPE et);
diff --git a/libsrc/visualization/vssolution.cpp b/libsrc/visualization/vssolution.cpp
index c2459857..ab7fe283 100644
--- a/libsrc/visualization/vssolution.cpp
+++ b/libsrc/visualization/vssolution.cpp
@@ -4483,6 +4483,7 @@ namespace netgen
 
                     if (strcmp (scalname, newscalname) != 0)
                       Tcl_SetVar ( interp, "::visoptions.scalfunction", newscalname, TCL_GLOBAL_ONLY );
+		    scalname = Tcl_GetVar (interp, "::visoptions.scalfunction", TCL_GLOBAL_ONLY);
                   }
                 if (strcmp (vssolution.soldata[i]->name, vecname) == 0)
                   {
diff --git a/ng/ngpkg.cpp b/ng/ngpkg.cpp
index b2755fde..05225a1a 100644
--- a/ng/ngpkg.cpp
+++ b/ng/ngpkg.cpp
@@ -3543,13 +3543,19 @@ namespace netgen
         buff.YUV = (uint8_t*)malloc(3*(PIXsize/2));
         buff.MPG = (uint8_t*)malloc(MPGbufsize);
 
+	cout << "z0" << endl;
+
         // Initialize libavcodec:
         //-----------------------
         if( !initialized ) {
+	  cout << "call register" << endl;
           av_register_all();
+	  cout << "reg done" << endl;
           initialized = 1;
         }
 
+	cout << "a" << endl;
+
         // Choose codec:
         //--------------
         codec = avcodec_find_encoder( codec_id );
@@ -3560,9 +3566,14 @@ namespace netgen
           return TCL_ERROR;
         }
 
+	cout << "b" << endl;
+
         // Init codec context etc.:
         //--------------------------
         context = avcodec_alloc_context();
+
+	cout << "b01" << endl;
+
         context->bit_rate = bitrate;
         context->width = nx;
         context->height = ny;
@@ -3572,6 +3583,8 @@ namespace netgen
         context->pix_fmt = PIX_FMT_YUV420P;
         context->flags |= CODEC_FLAG_PSNR;
 
+	cout << "b1" << endl;
+
         if( avcodec_open( context, codec ) < 0 ) {
           cout << "can't open codec" << endl;
           avcodec_close( context );
@@ -3581,6 +3594,8 @@ namespace netgen
           return TCL_ERROR;
         }
 
+	cout << "c" << endl;
+
         YUVpicture = avcodec_alloc_frame();
 
         YUVpicture->data[0] = buff.YUV;