Merge pull request #2550 from gforney/vcenter

add option to visualize slice vectors using CELL U, CELL V and CELL W data (preliminary)

Author: gforney

Source/shared/options_common.h

@@ -10,6 +10,8 @@
 #ifndef _DEFAULT_SOURCE
 #define _DEFAULT_SOURCE
 #endif
+//#define pp_VCELLUVW           // add add uvw to menu label for CELL U/V/W vector slice files
+
 
 #ifdef __INTEL_COMPILER
 #define INTEL_COMPILER_ANY

Source/shared/readhvac.c

@@ -654,6 +654,8 @@ int ReadHVACData0(hvacdatacollection *hvaccoll, int flag,
 
   ducttimes = hvaccoll->hvacductvalsinfo->times;
   nodetimes = hvaccoll->hvacnodevalsinfo->times;
+  max_node_buffer = 100;
+  NewMemory((void **)&node_buffer, max_node_buffer * sizeof(float));
   for(iframe = 0; iframe < nframes; iframe++) {
     int j;
     float time;
@@ -665,8 +667,8 @@ int ReadHVACData0(hvacdatacollection *hvaccoll, int flag,
     nodetimes[iframe] = time;
     if(n_node_vars > max_node_buffer) {
       FREEMEMORY(node_buffer);
-      NewMemory((void **)&node_buffer, (n_node_vars + 100) * sizeof(float));
       max_node_buffer = n_node_vars + 100;
+      NewMemory((void **)&node_buffer, max_node_buffer * sizeof(float));
     }
     for(j = 0; j < n_nodes; j++) {
       int k;

Source/shared/shared_structures.h

@@ -598,7 +598,7 @@ typedef struct _slicedata {
   float position_orig;
   int blocknumber;
   int cell_center_edge;
-  int vec_comp;
+  int vec_comp, cellvec_comp;
   int skipdup;
   int setvalmin, setvalmax;
   float globalmin_slice, globalmax_slice;
@@ -686,6 +686,7 @@ typedef struct _vslicedata {
   int finalize;
   int loaded,display;
   float valmin, valmax;
+  int cellvec_comp;
   int vslice_filetype;
   int vslicefile_labelindex;
   char menulabel[128];

Source/shared/string_util.c

@@ -1631,11 +1631,30 @@ int ReadLabels(flowlabels *flowlabel, BFILE *stream, char *suffix_label){
   TrimBack(buffer);
   len = strlen(buffer);
   if(suffix_label!=NULL)len_suffix_label = strlen(suffix_label);
+#ifdef pp_VCELLUVW
+  if(flowlabel!=NULL){
+    if(NewMemory((void **)&flowlabel->longlabel, (unsigned int)(len+len_suffix_label+4+len_skip_label+1))==0)return LABEL_ERR;
+    STRCPY(flowlabel->longlabel, buffer);
+    if(suffix_label != NULL && strlen(suffix_label) > 0){
+      int appended = 0;
+
+      if(strcmp(buffer, "CELL U") == 0 || 
+         strcmp(buffer, "CELL V") == 0 || 
+         strcmp(buffer, "CELL W") == 0){
+        if(strcmp(suffix_label, "(cell centered)") == 0){
+          STRCAT(flowlabel->longlabel, "(cell uvw centered)");
+          appended = 1;
+        }
+      }
+      if(appended==0)STRCAT(flowlabel->longlabel, suffix_label);
+    }
+#else
   if(flowlabel!=NULL){
     if(NewMemory((void **)&flowlabel->longlabel, (unsigned int)(len+len_suffix_label+len_skip_label+1))==0)return LABEL_ERR;
     STRCPY(flowlabel->longlabel, buffer);
     if(suffix_label!=NULL&&strlen(suffix_label)>0)STRCAT(flowlabel->longlabel, suffix_label);
   }
+#endif
 
   if(FGETS(buffer2, 255, stream)==NULL){
     strcpy(buffer2, "**");