handle evaluation of properties outside the mesh

Author: gtheler

src/io/print.c

@@ -37,7 +37,6 @@ int feenox_instruction_print(void *arg) {
   char default_print_format[] = DEFAULT_PRINT_FORMAT;
   int have_to_print = 1;
   int have_to_header = 0;
-  int i, j;
   int flag = 1;  // flag to know if we already printed something or not (for matrices)
 
   if ((int)feenox_special_var_value(in_static) != 0) {
@@ -116,7 +115,7 @@ int feenox_instruction_print(void *arg) {
       if (!print_token->vector->initialized) {
         feenox_call(feenox_vector_init(print_token->vector, FEENOX_VECTOR_INITIAL));
       }
-      for (i = 0; i < print_token->vector->size; i++) {
+      for (int i = 0; i < print_token->vector->size; i++) {
         fprintf(print->file->pointer, current_format, gsl_vector_get(feenox_value_ptr(print_token->vector), i));
         if (i != print_token->vector->size-1) {
           fprintf(print->file->pointer, "%s", print->separator);
@@ -132,8 +131,8 @@ int feenox_instruction_print(void *arg) {
       if (!print_token->matrix->initialized) {
         feenox_call(feenox_matrix_init(print_token->matrix));
       }
-      for (i = 0; i < print_token->matrix->rows; i++) {
-        for (j = 0; j < print_token->matrix->cols; j++) {
+      for (int i = 0; i < print_token->matrix->rows; i++) {
+        for (int j = 0; j < print_token->matrix->cols; j++) {
           fprintf(print->file->pointer, current_format, gsl_matrix_get(feenox_value_ptr(print_token->matrix), i, j));
           if (j != print_token->matrix->cols-1) {
             fprintf(print->file->pointer, "%s", print->separator);

src/mesh/interpolate.c

@@ -315,7 +315,15 @@ double feenox_function_property_eval(struct function_t *function, const double *
     return 1.0;
   }
 
-  element_t *element = feenox_mesh_find_element(function->mesh, NULL, x);
+  node_t *node = feenox_mesh_find_nearest_node(function->mesh, x);
+  element_t *element = feenox_mesh_find_element(function->mesh, node, x);
+  
+  if (element == NULL) {
+    // the point is off and does not enclose an element, get the first one which
+    // is attached to the nearest node
+    element = node->element_list->element;
+  }
+  
   if (element != NULL && element->physical_group != NULL && element->physical_group->material != NULL) {
     HASH_FIND_STR(element->physical_group->material->property_datums, property->name, property_data);
     if (property_data != NULL) {
@@ -327,7 +335,7 @@ double feenox_function_property_eval(struct function_t *function, const double *
         }  
       }
 
-      // finally evalaute the expression of the material found
+      // finally evaluate the expression of the material found
       y = feenox_expression_eval(&property_data->expr);
     }
   }